diff --git a/app/Http/Controllers/Admin/AdminOrderController.php b/app/Http/Controllers/Admin/AdminOrderController.php index d467825..827bd9d 100644 --- a/app/Http/Controllers/Admin/AdminOrderController.php +++ b/app/Http/Controllers/Admin/AdminOrderController.php @@ -59,10 +59,20 @@ class AdminOrderController extends Controller return redirect()->back()->with('success', 'Order created successfully with ID: ' . $newOrderId); } - public function show($id) { - $order = Order::findOrFail($id); - return view('admin.orders_show', compact('order')); + $order = Order::with('markList')->findOrFail($id); + + // Get the mark list associated with this order + $markList = $order->markList; + + // Fetch the user using the customer_id from mark list + $user = null; + if ($markList && $markList->customer_id) { + $user = \App\Models\User::where('customer_id', $markList->customer_id)->first(); + } + + return view('admin.orders_show', compact('order', 'markList', 'user')); } + } diff --git a/resources/views/admin/dashboard.blade.php b/resources/views/admin/dashboard.blade.php index a64eb2d..c63bb20 100644 --- a/resources/views/admin/dashboard.blade.php +++ b/resources/views/admin/dashboard.blade.php @@ -1,6 +1,6 @@ @extends('admin.layouts.app') -@section('page-title', 'Orders') +@section('page-title', 'Dashboard') @section('content')