|
@@ -792,6 +792,23 @@ class PracticeManagementController extends Controller
|
|
|
return view('app.practice-management.supply-orders-shipment-underway', compact('supplyOrders', 'counts'));
|
|
|
}
|
|
|
|
|
|
+ public function supplyOrdersHanging(Request $request)
|
|
|
+ {
|
|
|
+ $counts = $this->getSupplyOrderCounts();
|
|
|
+ $supplyOrders = SupplyOrder
|
|
|
+ ::select('supply_order.*')
|
|
|
+ ->leftJoin('shipment', function($join) {
|
|
|
+ $join->on('supply_order.shipment_id', '=', 'shipment.id');
|
|
|
+ })
|
|
|
+ ->where('shipment.status', 'CANCELLED')
|
|
|
+ ->where('supply_order.is_cancelled', false)
|
|
|
+ ->orderBy('supply_order.client_id', 'ASC')
|
|
|
+ ->orderBy('supply_order.mailing_address_full', 'ASC')
|
|
|
+ ->orderBy('supply_order.created_at', 'ASC')
|
|
|
+ ->paginate();
|
|
|
+ return view('app.practice-management.supply-orders-hanging', compact('supplyOrders', 'counts'));
|
|
|
+ }
|
|
|
+
|
|
|
private function getSupplyOrderCounts()
|
|
|
{
|
|
|
return [
|
|
@@ -802,7 +819,14 @@ class PracticeManagementController extends Controller
|
|
|
->whereNull('shipment_id')->count(),
|
|
|
"supplyOrdersShipmentUnderway" => SupplyOrder
|
|
|
::where('is_cancelled', false)
|
|
|
- ->whereNotNull('shipment_id')->count()
|
|
|
+ ->whereNotNull('shipment_id')->count(),
|
|
|
+ "supplyOrdersHanging" => SupplyOrder
|
|
|
+ ::leftJoin('shipment', function($join) {
|
|
|
+ $join->on('supply_order.shipment_id', '=', 'shipment.id');
|
|
|
+ })
|
|
|
+ ->where('shipment.status', 'CANCELLED')
|
|
|
+ ->where('supply_order.is_cancelled', false)
|
|
|
+ ->count(),
|
|
|
];
|
|
|
}
|
|
|
|