Merge branch 'dev' of http://103.248.30.24:3000/kent-logistics/Kent-logistics-Laravel into dev

app/Http/Controllers/Admin/AdminOrderController.php

@@ -10,6 +10,10 @@ use App\Models\MarkList;
 use App\Models\Invoice;
 use App\Models\InvoiceItem;
 use App\Models\User;
+use PDF; // barryvdh/laravel-dompdf facade
+use Maatwebsite\Excel\Facades\Excel;
+use App\Exports\OrdersExport;
+
 
 class AdminOrderController extends Controller
 {
@@ -379,47 +383,78 @@ class AdminOrderController extends Controller
         return view('admin.orders', compact('orders'));
     }
     
-public function downloadPdf(Request $request)
+// inside AdminOrderController
+
+private function buildOrdersQueryFromRequest(Request $request)
 {
     $query = Order::with(['markList', 'invoice', 'shipments']);
-    
-    // Apply filters
-    if ($request->has('search') && $request->search) {
+
+    // Search across order_id, markList.company_name, markList.customer_id, invoice.invoice_number
+    if ($request->filled('search')) {
         $search = $request->search;
         $query->where(function($q) use ($search) {
             $q->where('order_id', 'like', "%{$search}%")
-              ->orWhereHas('markList', function($q) use ($search) {
-                  $q->where('company_name', 'like', "%{$search}%");
+              ->orWhereHas('markList', function($q2) use ($search) {
+                  $q2->where('company_name', 'like', "%{$search}%")
+                     ->orWhere('customer_id', 'like', "%{$search}%");
               })
-              ->orWhereHas('invoice', function($q) use ($search) {
-                  $q->where('invoice_number', 'like', "%{$search}%");
+              ->orWhereHas('invoice', function($q3) use ($search) {
+                  $q3->where('invoice_number', 'like', "%{$search}%");
               });
         });
     }
-    
-    if ($request->has('status') && $request->status) {
+
+    // Invoice status filter
+    if ($request->filled('status')) {
         $query->whereHas('invoice', function($q) use ($request) {
             $q->where('status', $request->status);
         });
     }
-    
-    if ($request->has('shipment') && $request->shipment) {
+
+    // Shipment status filter
+    if ($request->filled('shipment')) {
         $query->whereHas('shipments', function($q) use ($request) {
             $q->where('status', $request->shipment);
         });
     }
-    
+
+    // optional ordering
+    $query->latest('id');
+
+    return $query;
+}
+
+public function downloadPdf(Request $request)
+{
+    // Build same filtered query used for table
+    $query = $this->buildOrdersQueryFromRequest($request);
+
     $orders = $query->get();
-    
-    $pdf = PDF::loadView('admin.orders.pdf', compact('orders'));
-    return $pdf->download('orders-report-' . date('Y-m-d') . '.pdf');
+
+    // optional: pass filters to view for header
+    $filters = [
+        'search' => $request->search ?? null,
+        'status' => $request->status ?? null,
+        'shipment' => $request->shipment ?? null,
+    ];
+
+    $pdf = PDF::loadView('admin.orders.pdf', compact('orders', 'filters'))
+              ->setPaper('a4', 'landscape'); // adjust if needed
+
+    $fileName = 'orders-report'
+              . ($filters['status'] ? "-{$filters['status']}" : '')
+              . '-' . date('Y-m-d') . '.pdf';
+
+    return $pdf->download($fileName);
 }
 
 public function downloadExcel(Request $request)
 {
+    // pass request to OrdersExport which will build Filtered query internally
     return Excel::download(new OrdersExport($request), 'orders-report-' . date('Y-m-d') . '.xlsx');
 }
 
+
 public function addTempItem(Request $request)
     {
         // Validate item fields