diff --git a/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php b/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php index 70aca682..1cabb5e1 100644 --- a/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php +++ b/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php @@ -69,7 +69,7 @@ class CreateOrderLogic extends AbstractControllerLogic $originWarehouse = $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? $this->fetchesCompanyModule->execute(['reference' => in_array($company->id, [2376]) ? WarehouseReferences::VT_GUANG_ZHOU : WarehouseReferences::YD_GUANG_ZHOU]) : $this->fetchesCompanyModule->execute(['reference' => WarehouseReferences::YD_YIWU]); if($originWarehouse->reference === WarehouseReferences::YD_YIWU && in_array($address->state_id, [5, 13, 14])) { - throw new RequestValidationException('Our Yiwu warehouse is unable to ship goods to Sabah & Sarawak at the moment due to the chinese new year\'s holiday. you can select our Guangzhou warehouse as an alternative.'); + throw new RequestValidationException('Our Yiwu warehouse is unable to ship goods to Sabah & Sarawak at the moment. you can select our Guangzhou warehouse as an alternative.'); } $order = $this->createOrderProcessor->execute($company, $originWarehouse, $address, $this->generatesOrderNumber->execute()); diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php index 45f32ad7..3ba6d129 100644 --- a/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php +++ b/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php @@ -100,8 +100,7 @@ class AssignPackingListOrderLogic extends AbstractControllerLogic { $warehouse_packing_list = $this->fetchesPackingList->execute([ 'id' => $request->route('id'), - 'type' => PackingListType::WAREHOUSE_RECEIVE_LIST, - 'status' => ApprovalStatus::REJECTED + 'type' => PackingListType::WAREHOUSE_RECEIVE_LIST ]); $order = $this->fetchesOrder->execute(['reference' => $request->route('reference')]); @@ -129,8 +128,7 @@ class AssignPackingListOrderLogic extends AbstractControllerLogic $packing_list = $this->fetchesPackingList->execute([ 'reference' => $warehouse_packing_list->reference, - 'type' => PackingListType::SHIPPING_PACKING_LIST, - 'status' => ApprovalStatus::PENDING_VERIFICATION + 'type' => PackingListType::SHIPPING_PACKING_LIST ]); $warehouse_packing_list = $this->updatesPackingListOwner->execute($packing_list, $order); diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php index e84da49e..6086ce13 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php @@ -269,7 +269,7 @@ class FetchOrderListsFromYdPortalProcessor $this->unityAssignContractEntity->execute($supervisorContractEntity->hash_id, $contractObligations); } - $packingListObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::SHIPPING_PACKING_LIST, ApprovalStatus::PENDING_VERIFICATION, !$allow_contract ? null : $contractReference); + $packingListObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::SHIPPING_PACKING_LIST, ApprovalStatus::SUSPENDED, !$allow_contract ? null : $contractReference); /** @var PackingList $packingList */ $packingList = $this->createPackingListProcessor->execute($packingListObject, $order); @@ -326,7 +326,8 @@ class FetchOrderListsFromYdPortalProcessor /** @var Container $container */ $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse); - $container->packingLists()->attach($packingList); + $container->packingLists()->detach($packingList); + $container->packingLists()->attach($packingList); $transport = $container->transports()->first(); @@ -338,6 +339,18 @@ class FetchOrderListsFromYdPortalProcessor } } + if($delayDate){ + + $transport = $container->transports()->first(); + + if(!$transport->schedules()->where('eta', '=', $delayDate)->first()) { + $etd = $transport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()->etd; + $transport->schedules()->update(['status' => ApprovalStatus::EXPIRED]); + $this->createsSchedule->execute($transport, new ScheduleObject($etd, $delayDate, ApprovalStatus::APPROVED)); + } + + } + if($unstuffingDate && $container->status !== ApprovalStatus::COMPLETED){ $container->update(['status' => ApprovalStatus::COMPLETED]); $container->transports()->first()->update(['drop_date' => $unstuffingDate, 'status' => ApprovalStatus::COMPLETED]); diff --git a/resources/assets/vue/components/orders/elements/ParcelComponent.vue b/resources/assets/vue/components/orders/elements/ParcelComponent.vue index 08218b96..01299ad1 100644 --- a/resources/assets/vue/components/orders/elements/ParcelComponent.vue +++ b/resources/assets/vue/components/orders/elements/ParcelComponent.vue @@ -2,7 +2,7 @@
-
+
Arrival Date

{{item.transport ? item.transport.drop_date : 'n/a'}}

-
+

Qty

{{item.quantity}}

-
+

Est. CBM

{{((parseFloat(item.cbm) * 1000) / 1000).toFixed(3)}}

-
+

Warehouse

{{item.order.warehouse.reference}}

-
+
diff --git a/resources/views/pages/warehouse_list.blade.php b/resources/views/pages/warehouse_list.blade.php index 4c72ebe0..58e96926 100644 --- a/resources/views/pages/warehouse_list.blade.php +++ b/resources/views/pages/warehouse_list.blade.php @@ -1,7 +1,7 @@ @extends('layouts.base_portal') @section('inner_content')
-
+