From 48f7ab82ffe35527050fad05c8dd127063a30fa7b520cbe69d6e8daa5693aace Mon Sep 17 00:00:00 2001 From: divya abdar Date: Fri, 19 Dec 2025 16:15:18 +0530 Subject: [PATCH] minor changes in order and dashboard, records --- .../Admin/AdminOrderController.php | 20 +++---- public/invoices/invoice-INV-2025-000028.pdf | Bin 59917 -> 59906 bytes resources/views/admin/dashboard.blade.php | 39 ++++++++++--- resources/views/admin/orders.blade.php | 14 ++--- resources/views/admin/reports.blade.php | 33 +++++++++-- resources/views/admin/see_order.blade.php | 52 ++++++++++++------ 6 files changed, 113 insertions(+), 45 deletions(-) diff --git a/app/Http/Controllers/Admin/AdminOrderController.php b/app/Http/Controllers/Admin/AdminOrderController.php index 7ecf7c8..84fed2c 100644 --- a/app/Http/Controllers/Admin/AdminOrderController.php +++ b/app/Http/Controllers/Admin/AdminOrderController.php @@ -497,18 +497,18 @@ class AdminOrderController extends Controller ->with('success', 'Order reset successfully.'); } - public function orderShow() - { - $orders = Order::with([ - 'markList', // company, customer, origin, destination, date - 'shipments', // shipment_id, shipment_date, status - 'invoice' // invoice number, dates, amounts, status + public function orderShow() + { + $orders = Order::with([ + 'markList', // company, customer, origin, destination, date + 'shipments', // shipment_id, shipment_date, status + 'invoice' // invoice number, dates, amounts, status ]) - ->latest('id') // show latest orders first - ->get(); + ->latest('id') // show latest orders first + ->get(); - return view('admin.orders', compact('orders')); - } + return view('admin.orders', compact('orders')); + } // inside AdminOrderController diff --git a/public/invoices/invoice-INV-2025-000028.pdf b/public/invoices/invoice-INV-2025-000028.pdf index 3a24644e1324110be5e74f929b18bce7763a7c2bf9f301e1737ab8143c199028..f932979692dfd1e06aa702ec2bebba15b4b304383b7988f1c5397940f50c7839 100644 GIT binary patch delta 3736 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 )5D63%~o5?Bl>!F58} z9FDnwMp|9KqF@RbJ8NsSg0+qH1zQ*vgF)D0Vb*raVv4_w;MxBC=e*$N?(Jr4$A-iz NC_vdHBs5NH{s%mocc%aV delta 3770 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 sk3~Z9P&^Ccount(); + $totalShipments = Shipment::count(); + $totalItems = OrderItem::count(); + + $totalRevenue = Invoice::sum('final_amount_with_gst'); + + // USERS (USING status COLUMN) + $activeCustomers = User::where('status', 'active')->count(); + $inactiveCustomers = User::where('status', 'inactive')->count(); + + // STAFF (ACTIVE ONLY, SoftDeletes SAFE) + $totalStaff = Staff::where('status', 'active')->count(); + + $orders = Order::latest()->get(); +@endphp @section('content')