"Updated AdminController and orders.blade.php to display order items, added modal to view order details, and made minor changes to adminheader.blade.php"

app/Http/Controllers/AdminController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
 use Illuminate\Support\Facades\DB;
 use App\Models\User;
 use App\Models\Order;
+use App\Models\OrderItem;
 
 
 
@@ -194,19 +195,44 @@ class AdminController extends Controller
         return redirect()->back();
     }
 
-
+    //old orders
     public function orders()
     {
         if (session()->get('type') == 'Admin') {
+            $orderItems = DB::table('order_items')
+                ->join('products', 'order_items.productId', 'products.id')
+                ->select('products.name', 'products.picture', 'order_items.*')
+                ->get();
+
             $orders = DB::table('users')
                 ->join('orders', 'orders.customerId', 'users.id')
                 ->select('orders.*', 'users.name', 'users.email', 'users.status as userStatus')
                 ->get();
-            return view('Dashboard.orders', compact('orders'));
+            return view('Dashboard.orders', compact('orders', 'orderItems'));
         }
         return redirect()->back();
     }
 
+    //new orders
+    // public function orders()
+    // {
+    //     if (session()->get('type') == 'Admin') {
+    //         $orderItems = DB::table('order_items')
+    //             ->join('products', 'order_items.productId', 'products.id')
+    //             ->select('products.name as productName', 'products.picture', 'order_items.*')
+    //             ->get();
+
+    //         $orders = DB::table('users')
+    //             ->join('orders', 'orders.customerId', 'users.id')
+    //             ->select('orders.*', 'users.name as userName', 'users.email', 'users.status as userStatus')
+    //             ->get();
+
+    //         return view('Dashboard.orders', compact('orders', 'orderItems'));
+    //     }
+    //     return redirect()->back();
+    // }
+
+
 
     public function changeOrderStatus($status, $id)
     {