diff --git a/app/Http/Controllers/Bo/OrdersController.php b/app/Http/Controllers/Bo/OrdersController.php
index bfd59ba..c4b8f2c 100644
--- a/app/Http/Controllers/Bo/OrdersController.php
+++ b/app/Http/Controllers/Bo/OrdersController.php
@@ -21,6 +21,7 @@ use App\Models\Setting;
 use Carbon\Carbon;
 use Carbon\CarbonImmutable;
 use Carbon\CarbonInterval;
+use Doctrine\DBAL\Query\QueryBuilder;
 use Gloudemans\Shoppingcart\Facades\Cart;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Http\Request;
@@ -52,6 +53,13 @@ class OrdersController extends Controller
             $orders = $orders->select('orders.*');
             $orders = $orders->join('timeslots', 'timeslots.order_id', '=', 'orders.id');
             $orders = $orders->where('timeslots.magasin_id', $filter_magasin);
+
+            // $orders = $orders->whereHas(
+            //     'timeslots',
+            //     function (QueryBuilder $q, $filter_magasin) {
+            //         $q->where('timeslots.magasin_id', $filter_magasin);
+            //     }
+            // );
         }
         if (!empty($filter_reference)) {
             $orders = $orders->where('reference', 'like', '%' . $filter_reference . '%');
@@ -93,7 +101,8 @@ class OrdersController extends Controller
      */
     protected function filterOrders(Request $request)
     {
-        $orders = Order::query()->orderByDesc('date');
+        // $orders = Order::query()->orderByDesc('date');
+        $orders = Order::query();
 
         if ($request->rst) {
             Session::remove('orders.sort_col');
@@ -131,7 +140,9 @@ class OrdersController extends Controller
                 case 'customer_id':
                     $orders = $orders->orderBy('customer_id', Session::get('orders.sort_way'));
                     break;
-            }//end switch
+            } //end switch
+        } else {
+            $orders->orderByDesc('date');
         }//end if
 
         return $orders;