Преглед изворни кода

Fixed query to get orders penfding processing

Samson Mutunga пре 1 година
родитељ
комит
7be6de2c67
1 измењених фајлова са 3 додато и 7 уклоњено
  1. 3 7
      app/Http/Controllers/AdminController.php

+ 3 - 7
app/Http/Controllers/AdminController.php

@@ -205,14 +205,10 @@ class AdminController extends Controller
         $rows = [];
         switch ($report) {
             case 'new-orders-pending-processing':
-                $rows = User::whereNotNull('upcoming_fill_date')
-                    ->whereRaw("(id NOT IN (SELECT store_order.user_id FROM store_order))")
-                    ->paginate(30);
+                $rows = User::whereHas('storeOrdersAsClient', function($qry){
+                    return $qry->whereRaw('(store_order.id NOT IN (SELECT financial_transaction.order_id FROM financial_transaction))');
+                })->paginate(30);
                 break;
-            case 'refills-pending-processing':
-                $rows = User::whereRaw("fill2date <= NOW()::date")
-                    ->whereRaw("(id IN (SELECT store_order.user_id FROM store_order))")
-                    ->paginate(30);
             default:
                 break;
         }