update marketing

Modules/Business/App/Http/Controllers/AcnooExpenseReportController.php

@@ -5,7 +5,6 @@
 use App\Models\Branch;
 use App\Models\Expense;
 use Illuminate\Http\Request;
-use Illuminate\Support\Carbon;
 use App\Http\Controllers\Controller;
 use App\Services\PdfService;
 use App\Traits\DateFilterTrait;
@@ -26,10 +25,6 @@ public function index(Request $request)
     {
         $businessId = auth()->user()->business_id;
 
-        $total_expense = Expense::where('business_id', $businessId)
-            ->whereDate('expenseDate', Carbon::today()->format('Y-m-d'))
-            ->sum('amount');
-
         $expenseQuery = Expense::with('category:id,categoryName', 'payment_type:id,name', 'branch:id,name', 'transactions')
             ->where('business_id', $businessId);
 
@@ -90,10 +85,40 @@ public function exportCsv()
 
     public function exportPdf(Request $request)
     {
-        $expense_reports = Expense::with('category:id,categoryName', 'payment_type:id,name', 'branch:id,name', 'transactions')->where('business_id', auth()->user()->business_id)
-            ->latest()
-            ->get();
+        $expenseQuery = Expense::with('category:id,categoryName', 'payment_type:id,name', 'branch:id,name', 'transactions')
+            ->where('business_id', auth()->user()->business_id);
 
-        return PdfService::render('business::reports.expense.pdf', compact('expense_reports'),'expenses-report.pdf');
+        $expenseQuery->when($request->branch_id, function ($q) use ($request) {
+            $q->where('branch_id', $request->branch_id);
+        });
+
+        // Date Filter
+        $duration = $request->custom_days ?: 'today';
+        [$filter_from_date, $filter_to_date] = $this->applyDateRange($duration, $request->from_date, $request->to_date);
+
+        $this->applyDateFilter($expenseQuery, $duration, 'expenseDate', $request->from_date, $request->to_date);
+
+        // Search Filter
+        if ($request->filled('search')) {
+            $expenseQuery->where(function ($query) use ($request) {
+                $query->where('expanseFor', 'like', '%' . $request->search . '%')
+                    ->orWhere('paymentType', 'like', '%' . $request->search . '%')
+                    ->orWhere('referenceNo', 'like', '%' . $request->search . '%')
+                    ->orWhere('amount', 'like', '%' . $request->search . '%')
+                    ->orWhereHas('category', function ($q) use ($request) {
+                        $q->where('categoryName', 'like', '%' . $request->search . '%');
+                    })
+                    ->orWhereHas('payment_type', function ($q) use ($request) {
+                        $q->where('name', 'like', '%' . $request->search . '%');
+                    })
+                    ->orWhereHas('branch', function ($q) use ($request) {
+                        $q->where('name', 'like', '%' . $request->search . '%');
+                    });
+            });
+        }
+
+        $expense_reports = $expenseQuery->latest()->limit($request->per_page ?? 20)->get();
+
+        return PdfService::render('business::reports.expense.pdf', compact('expense_reports', 'duration', 'filter_from_date', 'filter_to_date'),'expenses-report.pdf');
     }
 }