Logic fix in supply order matrix

app/Http/Controllers/PracticeManagementController.php

@@ -582,13 +582,13 @@ class PracticeManagementController extends Controller
 
         if ($filters['shipment']) {
             if ($filters['shipment'] === 'not_cleared_for_shipment')
-                $supplyOrders->where('is_cleared_for_shipment', false);
+                $supplyOrders->whereNull('shipment_id')->where('is_cleared_for_shipment', false);
             elseif ($filters['shipment'] === 'cleared_for_shipment')
-                $supplyOrders->where('is_cleared_for_shipment', true);
+                $supplyOrders->whereNull('shipment_id')->where('is_cleared_for_shipment', true);
             else
                 $supplyOrders
                     ->whereNotNull('shipment_id')
-                    ->whereRaw('(SELECT status FROM shipment WHERE id = ? LIMIT 1) = shipment_id', [$filters['shipment']]);
+                    ->whereRaw('(SELECT status FROM shipment WHERE id = shipment_id LIMIT 1) = ?', [$filters['shipment']]);
         }
 
         if($filters['lot_number']) $supplyOrders->where('lot_number', 'ILIKE', '%' . $filters['lot_number'] . '%');