From 2a469559178c7a30c4116d167839e39efad15d62 Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Thu, 2 Jan 2025 10:58:53 +0530
Subject: [PATCH] igr expense change  vadivel J 02-1-2025

---
 app/Controllers/Expense.php  | 8 ++------
 app/Models/Expense_model.php | 1 -
 app/Views/expense_list.php   | 4 ++++
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/Controllers/Expense.php b/app/Controllers/Expense.php
index bee5641f..bd34c484 100755
--- a/app/Controllers/Expense.php
+++ b/app/Controllers/Expense.php
@@ -27,12 +27,8 @@ class Expense 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');
diff --git a/app/Models/Expense_model.php b/app/Models/Expense_model.php
index 58554cc5..18863335 100755
--- a/app/Models/Expense_model.php
+++ b/app/Models/Expense_model.php
@@ -29,7 +29,6 @@ class Expense_model extends Model
                     ->join('t_supplierdetailsn', 't_expense.supplier_id = t_supplierdetailsn.SupplierID', 'left')
                     ->where('t_expense.isactive', 1)
                     ->where('t_expense.created_on >=',"$fromDate")
-                    ->where('t_expense.created_on <=',"$toDate")
                     ->orderBy('t_expense.created_on', 'DESC')
                     ->get()->getResult();
     }
diff --git a/app/Views/expense_list.php b/app/Views/expense_list.php
index ec997c70..e35cc1f9 100755
--- a/app/Views/expense_list.php
+++ b/app/Views/expense_list.php
@@ -130,6 +130,10 @@
                                         <?php
                                         if (!empty($expense_list)) {
                                             foreach ($expense_list as $record) {
+
+                                                $record = (array) $record;
+
+
                                                 $fileExists = 0;
                                                 $fileUrl = '';
                                                 if ($record['transporter_file']) {