diff --git a/app/Http/Controllers/Admin/AdminOrderController.php b/app/Http/Controllers/Admin/AdminOrderController.php index 051da6f..05a2446 100644 --- a/app/Http/Controllers/Admin/AdminOrderController.php +++ b/app/Http/Controllers/Admin/AdminOrderController.php @@ -191,6 +191,23 @@ class AdminOrderController extends Controller return view('admin.orders_show', compact('order', 'user')); } + public function popup($id) + { + // Load order with items + markList + $order = Order::with(['items', 'markList'])->findOrFail($id); + + // Fetch user based on markList customer_id (same as show method) + $user = null; + if ($order->markList && $order->markList->customer_id) { + $user = \App\Models\User::where('customer_id', $order->markList->customer_id)->first(); + } + + return view('admin.popup', compact('order', 'user')); + } + + + + public function resetTemp() { session()->forget(['temp_order_items', 'mark_no', 'origin', 'destination']); diff --git a/resources/views/admin/dashboard.blade.php b/resources/views/admin/dashboard.blade.php index c1df725..30975a3 100644 --- a/resources/views/admin/dashboard.blade.php +++ b/resources/views/admin/dashboard.blade.php @@ -429,10 +429,13 @@ body, .container-fluid { background: #f4f7fc; }
Detailed View of all Orders in this shipment consolidation.
+ + {{-- USER SECTION --}} +{{ $user->company_name ?? 'N/A Company' }}
+{{ $user->email ?? '' }}
+{{ $user->mobile_no ?? '' }}
+{{ $user->address ?? 'No Address' }}
+ {{ $user->pincode ?? '' }} +Order ID
+{{ $order->order_id }}
+Total Orders
+{{ $order->items->count() }}
+Status
+ {{ ucfirst($order->status) }} +| # | +Description | +CTN | +QTY | +TTL/QTY | +Unit | +Price (₹) | +TTL Amount (₹) | +CBM | +TTL CBM | +KG | +TTL KG | +Shop No | +
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {{ $index + 1 }} | +{{ $item->description }} | +{{ $item->ctn }} | +{{ $item->qty }} | +{{ $item->ttl_qty }} | +{{ strtoupper($item->unit) }} | +₹{{ number_format($item->price, 2) }} | +₹{{ number_format($item->ttl_amount, 2) }} | +{{ $item->cbm }} | +{{ $item->ttl_cbm }} | +{{ $item->kg }} | +{{ $item->ttl_kg }} | +{{ $item->shop_no }} | +
Total TTL/QTY
+Total TTL KG
+Total Amount
+