cief/portal
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/portal.git synced 2026-08-25 15:34:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'null_order_packing_list' into 'development'

Browse Source 
bug

See merge request CIEFWorldwideSdnBhd/shipping-portal!103
This commit is contained in:
Leong Chee Siong
2022-02-08 14:16:32 +00:00
parent f5bace1c3b fdc6a4adc1
commit d6faaecb35
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+18 -2
View File
@@ -208,7 +208,14 @@ class FetchOrderListsFromYdPortalProcessor
try{
$packingList = $this->fetchesPackingList->execute(['reference' => $row->expressno]);
} catch (ResourceNotFoundException $exception){
$appointee_id = !$allow_contract ? 2037 : $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
if (!$allow_contract) {
$appointee_id = 2037;
}
else {
$appointee_id = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
}
$warehouseReceiveObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::WAREHOUSE_RECEIVE_LIST, $allow_contract ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
/** @var PackingList $warehouseReceiveList */
@@ -261,7 +268,16 @@ class FetchOrderListsFromYdPortalProcessor
try {
$container = $this->fetchesContainer->execute(['reference' => $containerReference]);
} catch (ResourceNotFoundException $exception){
$originWarehouse = $this->fetchesCompanyModule->execute(['id' => $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->id]);
if (!$allow_contract) {
$appointee_id = 2037;
}
else {
$appointee_id = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->id;
}
$originWarehouse = $this->fetchesCompanyModule->execute(['id' => $appointee_id]);
$containerObject = new ContainerObject($containerReference, '', '', ContainerTypes::FORTY_FEET_DRY_CONTAINER, $loadingDate, ApprovalStatus::PENDING_VERIFICATION);
/** @var Container $container */
$container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);