From a80b3013c3ff511f2ddd507a0f004e3b873ad063 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 21 Apr 2022 10:31:24 +0800 Subject: [PATCH 1/4] go to previous yd warehouse --- .../Modules/Orders/ControllersLogic/CreateOrderLogic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php b/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php index 6ea917c0..510a2a29 100644 --- a/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php +++ b/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php @@ -67,7 +67,7 @@ class CreateOrderLogic extends AbstractControllerLogic $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $request->input('warehouse_id')]); if(!in_array($company->companyModules()->importers()->first()->id, WarehouseReferences::YD_EXEMPT_LIST)){ - $originWarehouse = $this->fetchesCompanyModule->execute(['reference' => $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? WarehouseReferences::YD_GUANG_ZHOU_2 : WarehouseReferences::YD_YIWU]); + $originWarehouse = $this->fetchesCompanyModule->execute(['reference' => $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? WarehouseReferences::YD_GUANG_ZHOU : WarehouseReferences::YD_YIWU]); } if($originWarehouse->reference === WarehouseReferences::YD_YIWU && in_array($address->state_id, [5, 13, 14])) { From a287a1193af6d0428949c51cb4059b9222e3535c Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 21 Apr 2022 12:19:57 +0800 Subject: [PATCH 2/4] allow admin to add arrived parcels --- .../components/orders/sections/OrderProfileSectionComponent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue index a0880e40..44d30669 100644 --- a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue +++ b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue @@ -274,7 +274,7 @@ style=" fill:#000000;"> -
+
Add Arrived Parcel
From 4e4475ad129a556795da36e966eeddd8d2037926 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 21 Apr 2022 14:12:23 +0800 Subject: [PATCH 3/4] switch back to temp warehouse --- .../Modules/Orders/ControllersLogic/CreateOrderLogic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php b/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php index 510a2a29..6ea917c0 100644 --- a/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php +++ b/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php @@ -67,7 +67,7 @@ class CreateOrderLogic extends AbstractControllerLogic $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $request->input('warehouse_id')]); if(!in_array($company->companyModules()->importers()->first()->id, WarehouseReferences::YD_EXEMPT_LIST)){ - $originWarehouse = $this->fetchesCompanyModule->execute(['reference' => $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? WarehouseReferences::YD_GUANG_ZHOU : WarehouseReferences::YD_YIWU]); + $originWarehouse = $this->fetchesCompanyModule->execute(['reference' => $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? WarehouseReferences::YD_GUANG_ZHOU_2 : WarehouseReferences::YD_YIWU]); } if($originWarehouse->reference === WarehouseReferences::YD_YIWU && in_array($address->state_id, [5, 13, 14])) { From 22f1548eac9f60e6b00028f78716a8337513caa9 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Thu, 21 Apr 2022 20:58:27 +0800 Subject: [PATCH 4/4] update delivery date --- .../ReschedulePackingListLogic.php | 29 ++++++++----------- .../elements/PackingListComponent.vue | 4 +++ 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/ReschedulePackingListLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/ReschedulePackingListLogic.php index 097b7e1e..50371cc6 100644 --- a/app/Classes/Modules/PackingLists/ControllersLogic/ReschedulePackingListLogic.php +++ b/app/Classes/Modules/PackingLists/ControllersLogic/ReschedulePackingListLogic.php @@ -56,28 +56,23 @@ class ReschedulePackingListLogic extends AbstractControllerLogic */ public function logic(Request $request) : JsonResponse { - try { - $packing_list = $this->fetchesPackingList->execute(['id' => $request->route('id')]); + $packing_list = $this->fetchesPackingList->execute(['id' => $request->route('id')]); - $transport = $packing_list->transports()->first(); + $transport = $packing_list->transports()->first(); - $old_sechedule = $transport->schedules()->first(); + $old_sechedule = $transport->schedules()->first(); - $this->updatesScheduleStatus->execute($old_sechedule, ApprovalStatus::REJECTED); + $this->updatesScheduleStatus->execute($old_sechedule, ApprovalStatus::REJECTED); - $scheduleObject = new ScheduleObject( - Carbon::parse($request->input('eta')), - Carbon::parse($request->input('etd')), - ApprovalStatus::APPROVED - ); - $schedule = $this->createsSchedule->execute($transport, $scheduleObject); - - return $this->resourceResponse(new PackingListResource($packing_list)); - - } catch (\Exception $exception){ - throw new ErrorException($exception->getMessage(), $exception->getCode()); - } + $scheduleObject = new ScheduleObject( + Carbon::parse($request->input('eta')), + Carbon::parse($request->input('etd')), + ApprovalStatus::APPROVED + ); + + $schedule = $this->createsSchedule->execute($transport, $scheduleObject); + return $this->resourceResponse(new PackingListResource($packing_list)); } } diff --git a/resources/assets/vue/components/containers/elements/PackingListComponent.vue b/resources/assets/vue/components/containers/elements/PackingListComponent.vue index 1139f971..102ea3ca 100644 --- a/resources/assets/vue/components/containers/elements/PackingListComponent.vue +++ b/resources/assets/vue/components/containers/elements/PackingListComponent.vue @@ -25,6 +25,10 @@

{{ item.transport.current_schedule.eta }}

{{ item.packages[0].container.transport ? item.packages[0].container.transport.dropped_days+' Days': 'n/a'}}

+
Reschedule Transport
+ + +