From aa71baf2fe987f7e01799046d17b30b3d2ed45a7 Mon Sep 17 00:00:00 2001 From: Gowtham M Date: Sat, 3 Jan 2026 17:08:08 +0530 Subject: [PATCH 1/2] Enquiry list changes : GWM --- app/Controllers/EnquiryController.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/Controllers/EnquiryController.php b/app/Controllers/EnquiryController.php index 3b67459..d43f72a 100644 --- a/app/Controllers/EnquiryController.php +++ b/app/Controllers/EnquiryController.php @@ -111,9 +111,15 @@ class EnquiryController extends ResourceController } } - if (!empty($from_date) || empty(!$to_date)) { - $from_date = DateTime::createFromFormat('Y-m-d 00:00:00', $from_date)->format('d-m-Y'); - $to_date = DateTime::createFromFormat('Y-m-d 23:59:59', $to_date)->format('d-m-Y'); + + + if (!empty($this->request->getGet('from_date'))) { + $from_date = DateTime::createFromFormat('d-m-Y', $this->request->getGet('from_date'))->format('Y-m-d 00:00:00'); + $from_date = DateTime::createFromFormat('Y-m-d 00:00:00', $this->request->getGet('from_date'))->format('d-m-Y'); + } + if (!empty($this->request->getGet('to_date'))) { + $to_date = DateTime::createFromFormat('d-m-Y', $this->request->getGet('to_date'))->format('Y-m-d 23:59:59'); + $to_date = DateTime::createFromFormat('Y-m-d 23:59:59', $this->request->getGet('to_date'))->format('d-m-Y'); } return $this->respond(['status' => 'success', 'code' => 200, 'data' => $data , 'from_date' => $from_date , 'to_date' => $to_date ], 200); From 442a0becf9a4f8101a498ac9deb444d524d324f0 Mon Sep 17 00:00:00 2001 From: Gowtham M Date: Sat, 3 Jan 2026 17:12:15 +0530 Subject: [PATCH 2/2] Enquiry list changes : GWM --- app/Controllers/EnquiryController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Controllers/EnquiryController.php b/app/Controllers/EnquiryController.php index d43f72a..1a5be4f 100644 --- a/app/Controllers/EnquiryController.php +++ b/app/Controllers/EnquiryController.php @@ -115,11 +115,11 @@ class EnquiryController extends ResourceController if (!empty($this->request->getGet('from_date'))) { $from_date = DateTime::createFromFormat('d-m-Y', $this->request->getGet('from_date'))->format('Y-m-d 00:00:00'); - $from_date = DateTime::createFromFormat('Y-m-d 00:00:00', $this->request->getGet('from_date'))->format('d-m-Y'); + $from_date = DateTime::createFromFormat('Y-m-d 00:00:00', $from_date)->format('d-m-Y'); } if (!empty($this->request->getGet('to_date'))) { $to_date = DateTime::createFromFormat('d-m-Y', $this->request->getGet('to_date'))->format('Y-m-d 23:59:59'); - $to_date = DateTime::createFromFormat('Y-m-d 23:59:59', $this->request->getGet('to_date'))->format('d-m-Y'); + $to_date = DateTime::createFromFormat('Y-m-d 23:59:59', $to_date)->format('d-m-Y'); } return $this->respond(['status' => 'success', 'code' => 200, 'data' => $data , 'from_date' => $from_date , 'to_date' => $to_date ], 200);