diff --git a/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php b/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php index 3081cffc..1cabb5e1 100644 --- a/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php +++ b/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php @@ -66,10 +66,10 @@ class CreateOrderLogic extends AbstractControllerLogic $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $request->input('warehouse_id')]); - $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' => $company->id === WarehouseReferences::YD_YIWU]); + $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/Orders/Processors/UpdateDoFromVTPortalProcessor.php b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php index 980ebf01..9485b1c6 100644 --- a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php +++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php @@ -74,6 +74,7 @@ class UpdateDoFromVTPortalProcessor $vt_do = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"Do","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"Filter": ["FullMarking:$contains$%js%\"' . $order->reference . '\"\u0000"]}}'), ''); $vt_do = $this->fetchesDataFRomVTPortal->getResponseBody($vt_do); + if ($vt_do) { foreach ($vt_do->Rows as $key => $row) { $vt_do_update = $this->fetchesDataFRomVTPortal->clientRequest( 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/ControllersLogic/UpdatePackingListStatusLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php index 4eb67646..19b70a55 100644 --- a/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php +++ b/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php @@ -74,8 +74,10 @@ class UpdatePackingListStatusLogic extends AbstractControllerLogic $address = $packing_list->owner()->first()->addresses()->where('status', ApprovalStatus::APPROVED)->first(); - $appointee = $address->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id; - $appointee === 2 ? $this->updateDoFromVTPortalProcessor->execute($address) : $this->updateDoFromYDPortalProcessor->execute($address); +// $appointee = $address->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id; + + $this->updateDoFromVTPortalProcessor->execute($address); + $this->updateDoFromYDPortalProcessor->execute($address); return $this->resourceResponse(new PackingListResource($packing_list)); } diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php index 6d4f8164..7af93d2a 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php @@ -126,7 +126,7 @@ class FetchLoadedContainersFromVTPortalProcessor DB::beginTransaction(); try { - $start = $start ? $start : Carbon::now()->subDays(10); + $start = $start ? $start : Carbon::now()->subDays(15); $startLimit = Carbon::parse('11-08-2021'); diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php index 7a81972f..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); @@ -310,6 +310,7 @@ class FetchOrderListsFromYdPortalProcessor if($containerReference) { try { $container = $this->fetchesContainer->execute(['reference' => $containerReference]); + $container->packingLists()->syncWithoutDetaching([$packingList->id]); } catch (ResourceNotFoundException $exception){ if (!$allow_contract) { @@ -325,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(); @@ -337,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]); @@ -380,6 +394,7 @@ class FetchOrderListsFromYdPortalProcessor } DB::commit(); + echo 'successful'; } } catch (\Exception $exception) { diff --git a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php index a4b846cf..f52fac65 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php @@ -116,7 +116,7 @@ class FetchWarehouseReceiveListFromVTPortalProcessor try { - $start = $start ? $start : Carbon::now()->subMonth(); + $start = $start ? $start : Carbon::now()->subMonths(2); $startLimit = Carbon::parse('11-08-2021'); diff --git a/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue index 60466864..749e7ef8 100644 --- a/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue +++ b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue @@ -11,29 +11,6 @@
-
-
- -
-
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/assets/vue/components/orders/forms/OrderFormComponent.vue b/resources/assets/vue/components/orders/forms/OrderFormComponent.vue index 9b1a4ebd..9b0020c9 100644 --- a/resources/assets/vue/components/orders/forms/OrderFormComponent.vue +++ b/resources/assets/vue/components/orders/forms/OrderFormComponent.vue @@ -45,16 +45,14 @@
-

请注意!! 由于近期船公司对于重量严格把控，我司对于货物超重的算法也进行了调整。新超重算法将从 2022 年 1 月 20日（货物装箱日期）起实行。

-

Attention!! Due to the shipping liner company are strict on checking the weight recently, our company has modified the calculation formula against overweight goods. The new formula will start to be applied on 20th January 2022 (goods loaded date).

-

For more details: https://www.cief-malaysia.com/services-sea-shipping/

+

最新运费价格 点击 “这里
For the latest shipping prices click here

-

浙江北仑疫情爆发， 义乌船期非常不稳定，建议发广州仓库
Due to Beilun, Zhejiang pandemic outbreak our Yiwu warehouse might experience unexpected shipping delays, you can select our Guangzhou warehouse as an alternative.

+

由于义乌船期不稳定，建议发广州仓库。
Due to unexpected shipping delays for Yiwu warehouse, you may select an alternative warehouse.

diff --git a/resources/views/pages/warehouse_list.blade.php b/resources/views/pages/warehouse_list.blade.php index 4f7b7e47..f9d8183b 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')
-
+
Arrived Parcel