diff --git a/app/Controllers/Amendmentpurchaseorder.php b/app/Controllers/Amendmentpurchaseorder.php index b5c5c667..86406d99 100755 --- a/app/Controllers/Amendmentpurchaseorder.php +++ b/app/Controllers/Amendmentpurchaseorder.php @@ -44,12 +44,8 @@ class Amendmentpurchaseorder extends BaseController if ($this->request->getMethod() === 'GET') { - $currentYear = date('Y'); - $currentMonth = date('m'); - $startOfMonth = "$currentYear-$currentMonth-01"; - $endOfMonth = date('Y-m-t'); - $fromDate = $startOfMonth; - $toDate = $endOfMonth; + $toDate = date('Y-m-d'); + $fromDate = date('Y-m-d', strtotime('-90 days', strtotime($toDate))); } elseif ($this->request->getMethod() === 'POST') { $fromDate = $this->request->getPost('fromDate'); $toDate = $this->request->getPost('toDate'); diff --git a/app/Controllers/Inwardgateregister.php b/app/Controllers/Inwardgateregister.php index c38f8b03..f633fb88 100755 --- a/app/Controllers/Inwardgateregister.php +++ b/app/Controllers/Inwardgateregister.php @@ -52,12 +52,8 @@ class Inwardgateregister extends BaseController if ($this->request->getMethod() === 'GET') { - $currentYear = date('Y'); - $currentMonth = date('m'); - $startOfMonth = "$currentYear-$currentMonth-01"; - $endOfMonth = date('Y-m-t'); - $fromDate = $startOfMonth; - $toDate = $endOfMonth; + $toDate = date('Y-m-d'); + $fromDate = date('Y-m-d', strtotime('-90 days', strtotime($toDate))); } elseif ($this->request->getMethod() === 'POST') { $fromDate = $this->request->getPost('fromDate'); $toDate = $this->request->getPost('toDate'); diff --git a/app/Controllers/Purchaseorder.php b/app/Controllers/Purchaseorder.php index 16b36555..0ec19a21 100755 --- a/app/Controllers/Purchaseorder.php +++ b/app/Controllers/Purchaseorder.php @@ -113,12 +113,8 @@ class Purchaseorder extends BaseController if ($this->request->getMethod() === 'GET') { - $currentYear = date('Y'); - $currentMonth = date('m'); - $startOfMonth = "$currentYear-$currentMonth-01"; - $endOfMonth = date('Y-m-t'); - $fromDate = $startOfMonth; - $toDate = $endOfMonth; + $toDate = date('Y-m-d'); + $fromDate = date('Y-m-d', strtotime('-90 days', strtotime($toDate))); } else if ($this->request->getMethod() === 'POST') { $fromDate = $this->request->getPost('fromDate'); $toDate = $this->request->getPost('toDate'); @@ -2562,12 +2558,8 @@ class Purchaseorder extends BaseController if ($this->request->getMethod() === 'GET') { - $currentYear = date('Y'); - $currentMonth = date('m'); - $startOfMonth = "$currentYear-$currentMonth-01"; - $endOfMonth = date('Y-m-t'); - $fromDate = $startOfMonth; - $toDate = $endOfMonth; + $toDate = date('Y-m-d'); + $fromDate = date('Y-m-d', strtotime('-90 days', strtotime($toDate))); } elseif ($this->request->getMethod() === 'POST') { $fromDate = $this->request->getPost('fromDate'); $toDate = $this->request->getPost('toDate'); diff --git a/app/Controllers/Sales.php b/app/Controllers/Sales.php index 267848f6..98e66f89 100755 --- a/app/Controllers/Sales.php +++ b/app/Controllers/Sales.php @@ -95,12 +95,8 @@ class Sales extends BaseController if ($this->request->getMethod() === 'GET') { - $currentYear = date('Y'); - $currentMonth = date('m'); - $startOfMonth = "$currentYear-$currentMonth-01"; - $endOfMonth = date('Y-m-t'); - $fromDate = $startOfMonth; - $toDate = $endOfMonth; + $toDate = date('Y-m-d'); + $fromDate = date('Y-m-d', strtotime('-90 days', strtotime($toDate))); } elseif ($this->request->getMethod() === 'POST') { $fromDate = $this->request->getPost('fromDate'); $toDate = $this->request->getPost('toDate');