From 87116d29c921113e02a3369efa1082dd9de8d12f Mon Sep 17 00:00:00 2001 From: edmondlang Date: Thu, 7 Apr 2022 22:54:02 +0800 Subject: [PATCH 01/40] last mile delivery search order ui and search order number function --- .../DeliveryOrdersTableSectionComponent.vue | 86 ++++++++++++++++++- 1 file changed, 82 insertions(+), 4 deletions(-) diff --git a/resources/assets/vue/components/orders/sections/DeliveryOrdersTableSectionComponent.vue b/resources/assets/vue/components/orders/sections/DeliveryOrdersTableSectionComponent.vue index eb424fc9..f43fde99 100644 --- a/resources/assets/vue/components/orders/sections/DeliveryOrdersTableSectionComponent.vue +++ b/resources/assets/vue/components/orders/sections/DeliveryOrdersTableSectionComponent.vue @@ -6,8 +6,58 @@
+
+
+
+
+
+
+ + + + +
+
+
+
+
+
+ + + + +
+
+
+
+
+
+ + + + +
+
+
+
+
+
+
+ Search +
+
+
+
+ Reset +
+
+
+
+
+
+
- + From 40d22de809b79e1199fda47103b5f55c9ceea2af Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 13 Apr 2022 12:19:34 +0800 Subject: [PATCH 20/40] fix customer profile --- .../sections/OnBoardingSectionComponent.vue | 105 +----------------- 1 file changed, 1 insertion(+), 104 deletions(-) diff --git a/resources/assets/vue/components/companies/sections/OnBoardingSectionComponent.vue b/resources/assets/vue/components/companies/sections/OnBoardingSectionComponent.vue index 2e4a9cec..c7b5b154 100644 --- a/resources/assets/vue/components/companies/sections/OnBoardingSectionComponent.vue +++ b/resources/assets/vue/components/companies/sections/OnBoardingSectionComponent.vue @@ -1,7 +1,7 @@ \ No newline at end of file From a5e47324b26074d6c59106ed8e7a42ca4b934467 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 13 Apr 2022 13:11:30 +0800 Subject: [PATCH 21/40] fix yd fetch --- .../PackingLists/Processors/CreatePackageProcessor.php | 3 ++- .../PackingLists/Processors/CreatePackingListProcessor.php | 5 ----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/app/Classes/Modules/PackingLists/Processors/CreatePackageProcessor.php b/app/Classes/Modules/PackingLists/Processors/CreatePackageProcessor.php index e1d112ed..08d94fb5 100644 --- a/app/Classes/Modules/PackingLists/Processors/CreatePackageProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/CreatePackageProcessor.php @@ -6,6 +6,7 @@ namespace App\Classes\Modules\PackingLists\Processors; use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject; use App\Classes\Modules\PackingLists\Services\Packages\CreatesPackage; use App\Classes\Modules\PackingLists\Standards\Rules\Packages\CanCreatePackage; +use App\Classes\ValueObjects\Constants\WarehouseReferences; use App\Models\PackingList; class CreatePackageProcessor @@ -47,7 +48,7 @@ class CreatePackageProcessor $replica = $packingList->packingLists()->first(); if($replica) { - $modificationValue = 1; + $modificationValue = in_array( $packingList->owner->owner->companyModule->id, WarehouseReferences::REPLICA_WHITE_LIST) ? 0 : 1; $packageObject = new PackageObject($object->getType(), $object->getDescription(), $object->getWidth() + $modificationValue, $object->getHeight() + $modificationValue, $object->getLength() + $modificationValue, $object->getWeight(), $object->getQuantity(), $object->getStatus()); $package = $this->createsPackage->execute($packageObject, $replica); } diff --git a/app/Classes/Modules/PackingLists/Processors/CreatePackingListProcessor.php b/app/Classes/Modules/PackingLists/Processors/CreatePackingListProcessor.php index 4f370aeb..655897b6 100644 --- a/app/Classes/Modules/PackingLists/Processors/CreatePackingListProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/CreatePackingListProcessor.php @@ -53,11 +53,6 @@ class CreatePackingListProcessor $appointee_id = $packingList->owner_id == 1 ? 2037 : $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id; - // white list return $packingList; - if($packingList->owner instanceOf Order){ - if(in_array( $packingList->owner->companyModule->id, WarehouseReferences::REPLICA_WHITE_LIST)) return $packingList; - } - $type = $object->getType() === PackingListType::SHIPPING_PACKING_LIST ? PackingListType::SHIPPING_PACKING_LIST_REPLICA : PackingListType::WAREHOUSE_RECEIVE_LIST_REPLICA; /** create packing list replica */ From ac0a90c1680dbb423487fdd884f2813596c97bb3 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 13 Apr 2022 13:17:04 +0800 Subject: [PATCH 22/40] fix yd fetch --- .../Modules/PackingLists/Processors/CreatePackageProcessor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/PackingLists/Processors/CreatePackageProcessor.php b/app/Classes/Modules/PackingLists/Processors/CreatePackageProcessor.php index 08d94fb5..b0d2e0b7 100644 --- a/app/Classes/Modules/PackingLists/Processors/CreatePackageProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/CreatePackageProcessor.php @@ -48,7 +48,7 @@ class CreatePackageProcessor $replica = $packingList->packingLists()->first(); if($replica) { - $modificationValue = in_array( $packingList->owner->owner->companyModule->id, WarehouseReferences::REPLICA_WHITE_LIST) ? 0 : 1; + $modificationValue = in_array( $replica->owner->owner->companyModule->id, WarehouseReferences::REPLICA_WHITE_LIST) ? 0 : 1; $packageObject = new PackageObject($object->getType(), $object->getDescription(), $object->getWidth() + $modificationValue, $object->getHeight() + $modificationValue, $object->getLength() + $modificationValue, $object->getWeight(), $object->getQuantity(), $object->getStatus()); $package = $this->createsPackage->execute($packageObject, $replica); } From da1b6b1b6d70d422ba805422cb42e7eaa6db7a4a Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 13 Apr 2022 13:22:23 +0800 Subject: [PATCH 23/40] fix yd fetch --- .../PackingLists/Processors/CreatePackageProcessor.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/Classes/Modules/PackingLists/Processors/CreatePackageProcessor.php b/app/Classes/Modules/PackingLists/Processors/CreatePackageProcessor.php index b0d2e0b7..477f7da7 100644 --- a/app/Classes/Modules/PackingLists/Processors/CreatePackageProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/CreatePackageProcessor.php @@ -7,6 +7,7 @@ use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject; use App\Classes\Modules\PackingLists\Services\Packages\CreatesPackage; use App\Classes\Modules\PackingLists\Standards\Rules\Packages\CanCreatePackage; use App\Classes\ValueObjects\Constants\WarehouseReferences; +use App\Models\Order; use App\Models\PackingList; class CreatePackageProcessor @@ -48,7 +49,12 @@ class CreatePackageProcessor $replica = $packingList->packingLists()->first(); if($replica) { - $modificationValue = in_array( $replica->owner->owner->companyModule->id, WarehouseReferences::REPLICA_WHITE_LIST) ? 0 : 1; + $modificationValue = 1; + + if($replica->owner->owner instanceof Order){ + $modificationValue = in_array( $replica->owner->owner->companyModule->id, WarehouseReferences::REPLICA_WHITE_LIST) ? 0 : 1; + } + $packageObject = new PackageObject($object->getType(), $object->getDescription(), $object->getWidth() + $modificationValue, $object->getHeight() + $modificationValue, $object->getLength() + $modificationValue, $object->getWeight(), $object->getQuantity(), $object->getStatus()); $package = $this->createsPackage->execute($packageObject, $replica); } From 4b3274f6d5dce480740cee0e3e57fbafefee7b4d Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 13 Apr 2022 14:24:50 +0800 Subject: [PATCH 24/40] fix yd fetch --- ...FetchWarehouseReceiveListFromVTPortalProcessor.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php index c8d126a5..20121f2d 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php @@ -198,16 +198,19 @@ class FetchWarehouseReceiveListFromVTPortalProcessor /** @var PackingList $packingList */ $packingList = $order->packingLists()->where('reference', '=', $packingListReference)->first(); + /** @var Transport $transport */ + $transport = $packingList->transports()->first(); if(!$packingList) { $packingList = $this->createPackingListProcessor->execute($packingListObject, $order); + } + + if($transport) $transport->schedules()->update(['status' => ApprovalStatus::EXPIRED]); + + if(!$transport){ $transportObject = new TransportObject(TransportType::LAND, null, $tracking, Carbon::parse($receiveDate), Carbon::parse($receiveDate), ApprovalStatus::APPROVED); $this->createsTransport->execute($transportObject, $packingList); } - /** @var Transport $transport */ - $transport = $packingList->transports()->first(); - - $transport->schedules()->update(['status' => ApprovalStatus::EXPIRED]); $this->createsSchedule->execute($transport, new ScheduleObject(Carbon::parse($receiveDate), Carbon::parse($receiveDate), ApprovalStatus::APPROVED)); From 88b3dc8b84e5c8dd039f038efce7ba9dd63f3006 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 13 Apr 2022 14:27:08 +0800 Subject: [PATCH 25/40] fix yd fetch --- .../FetchWarehouseReceiveListFromVTPortalProcessor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php index 20121f2d..1952633a 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php @@ -208,7 +208,7 @@ class FetchWarehouseReceiveListFromVTPortalProcessor if(!$transport){ $transportObject = new TransportObject(TransportType::LAND, null, $tracking, Carbon::parse($receiveDate), Carbon::parse($receiveDate), ApprovalStatus::APPROVED); - $this->createsTransport->execute($transportObject, $packingList); + $transport = $this->createsTransport->execute($transportObject, $packingList); } From 1426d804e5f2a450c3ed7435af5bbbaaf0bef3c2 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 13 Apr 2022 15:10:10 +0800 Subject: [PATCH 26/40] fix yd fetch --- resources/views/pages/warehouse_list.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/pages/warehouse_list.blade.php b/resources/views/pages/warehouse_list.blade.php index 10f92e66..8bfd9fa7 100644 --- a/resources/views/pages/warehouse_list.blade.php +++ b/resources/views/pages/warehouse_list.blade.php @@ -17,7 +17,7 @@
- + From 108a952ee3140249e470fa43514f4fe1d9285769 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 13 Apr 2022 21:56:21 +0800 Subject: [PATCH 27/40] update hywavetech lineclear excel format --- .../Services/ExportsDeliveryOrders.php | 10 +-- .../addresses/forms/AddressFormComponent.vue | 64 ++++++++++++++++++- .../validation/addressFormValidation.js | 14 +++- 3 files changed, 79 insertions(+), 9 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsDeliveryOrders.php b/app/Classes/Modules/Exports/Services/ExportsDeliveryOrders.php index 658220a3..3aa8c603 100644 --- a/app/Classes/Modules/Exports/Services/ExportsDeliveryOrders.php +++ b/app/Classes/Modules/Exports/Services/ExportsDeliveryOrders.php @@ -92,15 +92,15 @@ class ExportsDeliveryOrders implements FromQuery, WithHeadings, WithHeadingRow, 'ST00000020', $senderAddress->contacts()->first()->reference, $order->companyModule->name, - '*', - $senderAddress->street_one.', '.$senderAddress->street_two.' '.$senderAddress->district->name.' '.$senderAddress->postcode.' '.$senderAddress->state->name.' '.$senderAddress->country->name, + $senderAddress->street_one, + $senderAddress->street_two.' '.$senderAddress->district->name.' '.$senderAddress->postcode.' '.$senderAddress->state->name.' '.$senderAddress->country->name, '', $senderAddress->postcode, $senderAddress->contacts()->first()->phone, $deliveryAddress->contacts()->first()->reference, - '', - '*', - $deliveryAddress->street_one.', '.$deliveryAddress->street_two.' '.$deliveryAddress->district->name.' '.$deliveryAddress->postcode.' '.$deliveryAddress->state->name.' '.$deliveryAddress->country->name, + $deliveryAddress->reference, + $deliveryAddress->street_one, + $deliveryAddress->street_two.' '.$deliveryAddress->district->name.' '.$deliveryAddress->postcode.' '.$deliveryAddress->state->name.' '.$deliveryAddress->country->name, '', $deliveryAddress->postcode, $deliveryAddress->contacts()->first()->phone, diff --git a/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue b/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue index 5aaf56d0..3dc9325c 100644 --- a/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue +++ b/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue @@ -1,7 +1,7 @@