cief/portal
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/portal.git synced 2026-08-20 13:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix order status count

Browse Source
This commit is contained in:
omair saleh
2022-01-03 15:40:38 +08:00
parent 18554e9924
commit 40c5692276
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Resources/OrderResource.php
+1 -1
View File
@@ -43,7 +43,7 @@ class OrderResource extends JsonResource
'delivered_packages' => PackingListResource::collection(
$this->deliveredPackages()->get()
),
'received_packages' => PackingListResource::collection($this->packingLists()->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->get()),
'received_packages' => PackingListResource::collection($this->packingLists()->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->whereHas('packages')->get()),
];
}),
'remarks' => RemarkResource::collection($this->remarks),
app/Models/Order.php
+3 -3
View File
@@ -107,7 +107,7 @@ class Order extends AbstractModel implements Addressable, Packable, Remarkable
return $schedule->dispatched()
->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
}
);
)->whereHas('packages');
}
public function inTransitPackages()
@@ -122,7 +122,7 @@ class Order extends AbstractModel implements Addressable, Packable, Remarkable
->whereDoesntHave('containers', function($container) {
return $container->where('containers.status', ApprovalStatus::COMPLETED);
}
);
)->whereHas('packages');
}
public function destinationWarehousePackages()
@@ -137,7 +137,7 @@ class Order extends AbstractModel implements Addressable, Packable, Remarkable
function($schedule) {
return $schedule->dispatched()->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
}
);
)->whereHas('packages');
}
public function deliveredPackages()