From 9df9e5bd7c0eaa07a06e653ab202b757c705afc0 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 10 Feb 2022 11:13:58 +0800 Subject: [PATCH 01/20] fix $ is not a function bug --- .../assets/vue/components/general/forms/SelectableComponent.vue | 2 +- resources/views/vendor/js.blade.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/assets/vue/components/general/forms/SelectableComponent.vue b/resources/assets/vue/components/general/forms/SelectableComponent.vue index ab0ed0b5..d86c35cc 100644 --- a/resources/assets/vue/components/general/forms/SelectableComponent.vue +++ b/resources/assets/vue/components/general/forms/SelectableComponent.vue @@ -34,7 +34,7 @@ if(!success){return;} let vm = this; - let mappedList = $.map(response.payload.data, function(value){ + let mappedList = response.payload.data.map(function(value){ let preservedValue = value; return {'id': !isNaN(value[vm.valueColumn]) ? parseInt(value[vm.valueColumn]) : value[vm.valueColumn], 'text': vm.labelColumn.map(function(label){ diff --git a/resources/views/vendor/js.blade.php b/resources/views/vendor/js.blade.php index 9adee26b..f56b59e4 100644 --- a/resources/views/vendor/js.blade.php +++ b/resources/views/vendor/js.blade.php @@ -5,6 +5,7 @@ 'baseUrl' => url('/'), 'routes' => collect(\Route::getRoutes())->mapWithKeys(function ($route) { return [$route->getName() => $route->uri()]; }) ]) !!}; + window.$ = window.jQuery = require('jquery'); From 2691d7df3384be6d1cc00b227e90cc0a967adaff Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 10 Feb 2022 11:26:55 +0800 Subject: [PATCH 02/20] fix $ is not a function bug --- resources/views/vendor/js.blade.php | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/views/vendor/js.blade.php b/resources/views/vendor/js.blade.php index f56b59e4..9adee26b 100644 --- a/resources/views/vendor/js.blade.php +++ b/resources/views/vendor/js.blade.php @@ -5,7 +5,6 @@ 'baseUrl' => url('/'), 'routes' => collect(\Route::getRoutes())->mapWithKeys(function ($route) { return [$route->getName() => $route->uri()]; }) ]) !!}; - window.$ = window.jQuery = require('jquery'); From 6f547b0a2f941a2b27494f2a2f70a48cd7f98eb3 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sat, 12 Feb 2022 19:53:01 +0800 Subject: [PATCH 03/20] add remark to yd address on release --- .../Processors/UpdateDoFromYDPortalProcessor.php | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php b/app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php index 2f732ffd..e48b1d33 100644 --- a/app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php +++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php @@ -45,25 +45,15 @@ class UpdateDoFromYDPortalProcessor foreach ($packing_lists as $key => $row) { if ($row->status === ApprovalStatus::SUSPENDED) { - $this->fetchesDataFRomYDPortal->clientRequest( - 'http://www.yd-wl.com/api/UpdateOrderAddress.ashx', - 'POST', - [ - 'expressno' => $row->reference, - 'customers_name' => '', - 'cellphone' => '', - 'postcode' => '', - 'streetAddress' => '' - ]); - - continue; } $contact = $address->contacts()->first(); + $remark = $address->remarks()->first(); $phone = $contact ? $contact->phone : null; $reference = $contact ? $contact->reference : null; + $remark = $remark ? $remark->content : null; $this->fetchesDataFRomYDPortal->clientRequest( 'http://www.yd-wl.com/api/UpdateOrderAddress.ashx', @@ -73,7 +63,7 @@ class UpdateDoFromYDPortalProcessor 'customers_name' => $reference, 'cellphone' => $phone, 'postcode' => $address->postcode, - 'streetAddress' => $address->street_one . ' ' . $address->street_two . ' '. $address->district->name.' '. $address->post_code.' '.$address->state->name.' '.$address->country->name.' '.$address->postcode + 'streetAddress' => $address->street_one . ' ' . $address->street_two . ' '. $address->district->name.' '. $address->post_code.' '.$address->state->name.' '.$address->country->name.' '.$address->postcode.' || '.$remark ]); From 2deea66f0a629ecfc7035f3114fd6fb492f7e9f0 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 15 Feb 2022 11:25:40 +0800 Subject: [PATCH 04/20] add remark to yd address on release --- .../Orders/Processors/UpdateDoFromYDPortalProcessor.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php b/app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php index e48b1d33..1b839803 100644 --- a/app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php +++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php @@ -54,7 +54,14 @@ class UpdateDoFromYDPortalProcessor $phone = $contact ? $contact->phone : null; $reference = $contact ? $contact->reference : null; $remark = $remark ? $remark->content : null; +dd([ + 'expressno' => $row->reference, + 'customers_name' => $reference, + 'cellphone' => $phone, + 'postcode' => $address->postcode, + 'streetAddress' => $address->street_one . ' ' . $address->street_two . ' '. $address->district->name.' '. $address->post_code.' '.$address->state->name.' '.$address->country->name.' '.$address->postcode.' || '.$remark +]); $this->fetchesDataFRomYDPortal->clientRequest( 'http://www.yd-wl.com/api/UpdateOrderAddress.ashx', 'POST', From 314575e2b6ed779b24bed3160b7c1f7394857191 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 15 Feb 2022 11:28:10 +0800 Subject: [PATCH 05/20] add remark to yd address on release --- .../Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php b/app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php index 1b839803..90939ab8 100644 --- a/app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php +++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php @@ -50,7 +50,7 @@ class UpdateDoFromYDPortalProcessor $contact = $address->contacts()->first(); $remark = $address->remarks()->first(); - +dd($contact); $phone = $contact ? $contact->phone : null; $reference = $contact ? $contact->reference : null; $remark = $remark ? $remark->content : null; From 552b6f0e1e2c01e5cc1b68718e5ae467a32cde3f Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 15 Feb 2022 11:28:42 +0800 Subject: [PATCH 06/20] add remark to yd address on release --- .../Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php b/app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php index 90939ab8..52ca44d2 100644 --- a/app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php +++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php @@ -50,7 +50,7 @@ class UpdateDoFromYDPortalProcessor $contact = $address->contacts()->first(); $remark = $address->remarks()->first(); -dd($contact); +dd($address->contacts); $phone = $contact ? $contact->phone : null; $reference = $contact ? $contact->reference : null; $remark = $remark ? $remark->content : null; From 753951a1d2b76915d460291ff74adbbac1514bc0 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 15 Feb 2022 11:30:43 +0800 Subject: [PATCH 07/20] add remark to yd address on release --- .../Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php | 2 +- .../ControllersLogic/UpdatePackingListStatusLogic.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php b/app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php index 52ca44d2..1b839803 100644 --- a/app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php +++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php @@ -50,7 +50,7 @@ class UpdateDoFromYDPortalProcessor $contact = $address->contacts()->first(); $remark = $address->remarks()->first(); -dd($address->contacts); + $phone = $contact ? $contact->phone : null; $reference = $contact ? $contact->reference : null; $remark = $remark ? $remark->content : null; diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php index d7d8a8a4..b2b1485f 100644 --- a/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php +++ b/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php @@ -71,6 +71,7 @@ class UpdatePackingListStatusLogic extends AbstractControllerLogic $packing_list = $this->updatesPackingListStatus->execute($packingList, $request->route('status')); $address = $packing_list->owner()->first()->addresses()->first(); + dd($address); $appointee = $address->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id; $appointee === 2 ? $this->updateDoFromVTPortalProcessor->execute($address) : $this->updateDoFromYDPortalProcessor->execute($address); From f01640d9f26745be285fd1a7e5ee27a1d949c9e4 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 15 Feb 2022 11:31:24 +0800 Subject: [PATCH 08/20] add remark to yd address on release --- .../ControllersLogic/UpdatePackingListStatusLogic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php index b2b1485f..3c6986ac 100644 --- a/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php +++ b/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php @@ -71,7 +71,7 @@ class UpdatePackingListStatusLogic extends AbstractControllerLogic $packing_list = $this->updatesPackingListStatus->execute($packingList, $request->route('status')); $address = $packing_list->owner()->first()->addresses()->first(); - dd($address); + dd($address->contacts); $appointee = $address->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id; $appointee === 2 ? $this->updateDoFromVTPortalProcessor->execute($address) : $this->updateDoFromYDPortalProcessor->execute($address); From 29d1fb893d42b69c330d62b1894c148159d65350 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 15 Feb 2022 11:33:10 +0800 Subject: [PATCH 09/20] add remark to yd address on release --- .../Orders/Processors/UpdateDoFromYDPortalProcessor.php | 7 ------- .../ControllersLogic/UpdatePackingListStatusLogic.php | 5 +++-- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php b/app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php index 1b839803..e48b1d33 100644 --- a/app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php +++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php @@ -54,14 +54,7 @@ class UpdateDoFromYDPortalProcessor $phone = $contact ? $contact->phone : null; $reference = $contact ? $contact->reference : null; $remark = $remark ? $remark->content : null; -dd([ - 'expressno' => $row->reference, - 'customers_name' => $reference, - 'cellphone' => $phone, - 'postcode' => $address->postcode, - 'streetAddress' => $address->street_one . ' ' . $address->street_two . ' '. $address->district->name.' '. $address->post_code.' '.$address->state->name.' '.$address->country->name.' '.$address->postcode.' || '.$remark -]); $this->fetchesDataFRomYDPortal->clientRequest( 'http://www.yd-wl.com/api/UpdateOrderAddress.ashx', 'POST', diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php index 3c6986ac..4eb67646 100644 --- a/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php +++ b/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php @@ -11,6 +11,7 @@ use App\Classes\Modules\PackingLists\Services\UpdatesPackingListStatus; use App\Classes\Modules\PackingLists\Standards\Rules\CanUpdatePackingList; use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject; use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor; +use App\Classes\ValueObjects\Constants\ApprovalStatus; use App\Classes\ValueObjects\Constants\OrderRoleTypes; use App\Http\Resources\PackingListResource; use ErrorException; @@ -70,8 +71,8 @@ class UpdatePackingListStatusLogic extends AbstractControllerLogic $packingList = $this->fetchesPackingList->execute(['id' => $request->route('id')]); $packing_list = $this->updatesPackingListStatus->execute($packingList, $request->route('status')); - $address = $packing_list->owner()->first()->addresses()->first(); - dd($address->contacts); + $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); From fc0809d9d20a4234ff2b072b0ac93991c49a08d7 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 15 Feb 2022 14:50:52 +0800 Subject: [PATCH 10/20] add remark to yd address on release --- .../Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php b/app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php index e48b1d33..1404f149 100644 --- a/app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php +++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php @@ -53,7 +53,7 @@ class UpdateDoFromYDPortalProcessor $phone = $contact ? $contact->phone : null; $reference = $contact ? $contact->reference : null; - $remark = $remark ? $remark->content : null; + $remark = $remark ? $remark->content : 'URGENT!!! PLEASE CALL BEFORE ONE DAY DELIVERY.'; $this->fetchesDataFRomYDPortal->clientRequest( 'http://www.yd-wl.com/api/UpdateOrderAddress.ashx', From 64467ea4beef414111767ce9ea8cf34ccccb3eeb Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 17 Feb 2022 15:07:25 +0800 Subject: [PATCH 11/20] test vt do --- .../Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php index 74fb7f62..50308ea6 100644 --- a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php +++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php @@ -74,7 +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); - +dd("' . $address->street_one . ' ' . $address->street_two . ' '. $address->district->name.' '. $address->post_code.' '.$address->state->name.' '.$address->country->name.'"); if ($vt_do) { foreach ($vt_do->Rows as $key => $row) { $vt_do_update = $this->fetchesDataFRomVTPortal->clientRequest( From a76ce3983080e563c06c73331a2f0c6027a71a88 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 17 Feb 2022 15:09:40 +0800 Subject: [PATCH 12/20] test vt do --- .../Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php index 50308ea6..13fb5214 100644 --- a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php +++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php @@ -74,7 +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); -dd("' . $address->street_one . ' ' . $address->street_two . ' '. $address->district->name.' '. $address->post_code.' '.$address->state->name.' '.$address->country->name.'"); +dd($address->street_one . ' ' . $address->street_two . ' '. $address->district->name.' '. $address->post_code.' '.$address->state->name.' '.$address->country->name); if ($vt_do) { foreach ($vt_do->Rows as $key => $row) { $vt_do_update = $this->fetchesDataFRomVTPortal->clientRequest( From 288cced125b05b309a34a61ed84448fc3aac816e Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 17 Feb 2022 15:10:57 +0800 Subject: [PATCH 13/20] test vt do --- .../Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php index 13fb5214..c7a9f03d 100644 --- a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php +++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php @@ -74,7 +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); -dd($address->street_one . ' ' . $address->street_two . ' '. $address->district->name.' '. $address->post_code.' '.$address->state->name.' '.$address->country->name); +dd($address->street_one . ' ' . $address->street_two . ' '. $address->district->name.' '. $address->postcode.' '.$address->state->name.' '.$address->country->name); if ($vt_do) { foreach ($vt_do->Rows as $key => $row) { $vt_do_update = $this->fetchesDataFRomVTPortal->clientRequest( From f5a67f7e970a9b283573148c4aeaea6649c8cf3a Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 17 Feb 2022 15:11:27 +0800 Subject: [PATCH 14/20] test vt do --- .../Orders/Processors/UpdateDoFromVTPortalProcessor.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php index c7a9f03d..980ebf01 100644 --- a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php +++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php @@ -74,7 +74,6 @@ 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); -dd($address->street_one . ' ' . $address->street_two . ' '. $address->district->name.' '. $address->postcode.' '.$address->state->name.' '.$address->country->name); if ($vt_do) { foreach ($vt_do->Rows as $key => $row) { $vt_do_update = $this->fetchesDataFRomVTPortal->clientRequest( @@ -91,7 +90,7 @@ dd($address->street_one . ' ' . $address->street_two . ' '. $address->district- "Values": [ { "Name": "ShippingAddress", - "NewValue": "' . $address->street_one . ' ' . $address->street_two . ' '. $address->district->name.' '. $address->post_code.' '.$address->state->name.' '.$address->country->name.'", + "NewValue": "' . $address->street_one . ' ' . $address->street_two . ' '. $address->district->name.' '. $address->postcode.' '.$address->state->name.' '.$address->country->name.'", "Modified": true, "ReadOnly": false, "Error": null From 6f30884a8cefb541a1830fa2046a7dcb36640442 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Sun, 20 Feb 2022 16:38:46 +0800 Subject: [PATCH 15/20] add page orders table --- .../assets/sass/modules/_typography.scss | 4 + .../sections/OrdersTableSectionComponent.vue | 290 ++++++++++++++++++ resources/views/emails/layout/base.blade.php | 3 + resources/views/pages/orders/table.blade.php | 13 + routes/web.php | 4 + 5 files changed, 314 insertions(+) create mode 100644 resources/assets/vue/components/orders/sections/OrdersTableSectionComponent.vue create mode 100644 resources/views/pages/orders/table.blade.php diff --git a/resources/assets/sass/modules/_typography.scss b/resources/assets/sass/modules/_typography.scss index dbc80e6f..a22dc2fc 100644 --- a/resources/assets/sass/modules/_typography.scss +++ b/resources/assets/sass/modules/_typography.scss @@ -643,6 +643,10 @@ hr{ cursor: pointer !important; } +.not-allowed { + cursor: not-allowed !important; +} + /* Labels ------------------------------------ */ diff --git a/resources/assets/vue/components/orders/sections/OrdersTableSectionComponent.vue b/resources/assets/vue/components/orders/sections/OrdersTableSectionComponent.vue new file mode 100644 index 00000000..0175534f --- /dev/null +++ b/resources/assets/vue/components/orders/sections/OrdersTableSectionComponent.vue @@ -0,0 +1,290 @@ + + diff --git a/resources/views/emails/layout/base.blade.php b/resources/views/emails/layout/base.blade.php index 0f58c396..ec9a6f85 100644 --- a/resources/views/emails/layout/base.blade.php +++ b/resources/views/emails/layout/base.blade.php @@ -82,6 +82,9 @@ .pointer { cursor: pointer; } + .not-allowed { + cursor: not-allowed; + } .text-complete { color: #009add; } diff --git a/resources/views/pages/orders/table.blade.php b/resources/views/pages/orders/table.blade.php new file mode 100644 index 00000000..9f42cef6 --- /dev/null +++ b/resources/views/pages/orders/table.blade.php @@ -0,0 +1,13 @@ + + +@extends('layouts.base_portal') +@section('inner_content') + {{--
--}} + {{--
--}} + {{--
--}} + {{--
Refresh Orders
--}} + {{--
--}} + {{--
--}} + {{----}} + +@endsection \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index f01fc716..2f5f245c 100644 --- a/routes/web.php +++ b/routes/web.php @@ -63,6 +63,10 @@ Route::get('/orders', function () { return view('pages.orders.index'); })->name('orders'); +Route::get('/orders-table', function () { + return view('pages.orders.table'); +})->name('ordersTable'); + Route::get('/order/show/{order_number}', function ($orderNumber) { return view('pages.orders.profile', ['id' => $orderNumber]); })->name('order.show'); From 994d7ab4d93654d43992c1a8a04e686ecf3e2696 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Mon, 21 Feb 2022 14:42:10 +0800 Subject: [PATCH 16/20] update list postcode component --- .../vue/components/settings/elements/ListPostcodeComponent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/vue/components/settings/elements/ListPostcodeComponent.vue b/resources/assets/vue/components/settings/elements/ListPostcodeComponent.vue index 101eca6a..a23f3a7c 100644 --- a/resources/assets/vue/components/settings/elements/ListPostcodeComponent.vue +++ b/resources/assets/vue/components/settings/elements/ListPostcodeComponent.vue @@ -40,7 +40,7 @@ export default { props: { data: { - type: Object, + type: String, required: false }, section: { From 0496851286fae26542a4700971f15c49c4f34653 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Mon, 21 Feb 2022 16:11:39 +0800 Subject: [PATCH 17/20] update settings add state charges TAB --- .../ControllersLogic/ListStatesLogic.php | 54 +++++++++++++ .../Addresses/Services/ListsStates.php | 33 ++++++++ .../Addresses/ListStatesController.php | 20 +++++ app/Http/Resources/StateResource.php | 23 ++++++ app/Models/State.php | 8 +- .../elements/StatesChargesComponent.vue | 77 +++++++++++++++++++ .../forms/EditStateChargesFormComponent.vue | 62 +++++++++++++++ .../user/elements/UserComponent.vue | 2 +- resources/views/pages/settings.blade.php | 45 +++++++++++ routes/address.php | 2 + 10 files changed, 321 insertions(+), 5 deletions(-) create mode 100644 app/Classes/Modules/Addresses/ControllersLogic/ListStatesLogic.php create mode 100644 app/Classes/Modules/Addresses/Services/ListsStates.php create mode 100644 app/Http/Controllers/Addresses/ListStatesController.php create mode 100644 app/Http/Resources/StateResource.php create mode 100644 resources/assets/vue/components/settings/elements/StatesChargesComponent.vue create mode 100644 resources/assets/vue/components/settings/forms/EditStateChargesFormComponent.vue diff --git a/app/Classes/Modules/Addresses/ControllersLogic/ListStatesLogic.php b/app/Classes/Modules/Addresses/ControllersLogic/ListStatesLogic.php new file mode 100644 index 00000000..3d6c484f --- /dev/null +++ b/app/Classes/Modules/Addresses/ControllersLogic/ListStatesLogic.php @@ -0,0 +1,54 @@ + 'Retrieved Addresses', + 'message' => 'You have successfully retrieved a list of Addresses' + ]; + } + + /** @var ListsStates */ + private $listStates; + + /** + * ListStatesLogic constructor. + * @param ListsStates $listStates + */ + public function __construct(ListsStates $listStates) + { + $this->listStates = $listStates; + } + + /** + * @param Request $request + * @return JsonResponse + * @throws \App\Classes\Exceptions\MalformedRequestException + */ + public function logic(Request $request) : JsonResponse + { + $query = $this->listStates->execute($this->listStates->deserializeFilters($request->input('filters'))); + + return $this->collectionResponse(StateResource::collection($query)); + + } + +} \ No newline at end of file diff --git a/app/Classes/Modules/Addresses/Services/ListsStates.php b/app/Classes/Modules/Addresses/Services/ListsStates.php new file mode 100644 index 00000000..5591b823 --- /dev/null +++ b/app/Classes/Modules/Addresses/Services/ListsStates.php @@ -0,0 +1,33 @@ +repository = $repository; + } + + + /** + * @return Builder + */ + function getRepository(): Builder + { + return $this->repository->newQuery(); + } +} \ No newline at end of file diff --git a/app/Http/Controllers/Addresses/ListStatesController.php b/app/Http/Controllers/Addresses/ListStatesController.php new file mode 100644 index 00000000..dee2d1c6 --- /dev/null +++ b/app/Http/Controllers/Addresses/ListStatesController.php @@ -0,0 +1,20 @@ +execute($request); + } + +} \ No newline at end of file diff --git a/app/Http/Resources/StateResource.php b/app/Http/Resources/StateResource.php new file mode 100644 index 00000000..b9d71dae --- /dev/null +++ b/app/Http/Resources/StateResource.php @@ -0,0 +1,23 @@ + $this->id, + 'name' => $this->name, + 'country' => $this->country, + ]; + } +} diff --git a/app/Models/State.php b/app/Models/State.php index fa920454..3f7036ac 100644 --- a/app/Models/State.php +++ b/app/Models/State.php @@ -2,7 +2,7 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Relations\HasOne; +use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\SoftDeletes; /** @@ -21,10 +21,10 @@ class State extends AbstractModel protected $dates = ['deleted_at']; /** - * @return HasOne + * @return BelongsTo */ - public function country(): HasOne + public function country(): BelongsTo { - return $this->hasOne(Country::class, 'country_id', 'id'); + return $this->belongsTo(Country::class, 'country_id', 'id'); } } diff --git a/resources/assets/vue/components/settings/elements/StatesChargesComponent.vue b/resources/assets/vue/components/settings/elements/StatesChargesComponent.vue new file mode 100644 index 00000000..9e58b60d --- /dev/null +++ b/resources/assets/vue/components/settings/elements/StatesChargesComponent.vue @@ -0,0 +1,77 @@ + + \ No newline at end of file diff --git a/resources/assets/vue/components/settings/forms/EditStateChargesFormComponent.vue b/resources/assets/vue/components/settings/forms/EditStateChargesFormComponent.vue new file mode 100644 index 00000000..ee32bf93 --- /dev/null +++ b/resources/assets/vue/components/settings/forms/EditStateChargesFormComponent.vue @@ -0,0 +1,62 @@ + + \ No newline at end of file diff --git a/resources/assets/vue/components/user/elements/UserComponent.vue b/resources/assets/vue/components/user/elements/UserComponent.vue index 20b57e6f..601c0097 100644 --- a/resources/assets/vue/components/user/elements/UserComponent.vue +++ b/resources/assets/vue/components/user/elements/UserComponent.vue @@ -4,7 +4,7 @@
- +
diff --git a/resources/views/pages/settings.blade.php b/resources/views/pages/settings.blade.php index c82482dd..c23c31b5 100644 --- a/resources/views/pages/settings.blade.php +++ b/resources/views/pages/settings.blade.php @@ -127,6 +127,26 @@
+
+
+
+
+
+
+
+
+ +
+
+
States Charges
+
+
+
+
+
+
+
+
@@ -347,6 +367,31 @@ +
+
+ +
+
+
+
+
+ State Charges +
+
+
+
+
+ + + +
+
+
+
+
+
diff --git a/routes/address.php b/routes/address.php index 5b3c6a1b..96cfe8ab 100644 --- a/routes/address.php +++ b/routes/address.php @@ -11,6 +11,8 @@ Route::group(['prefix' => 'address', 'as' => 'address.', 'namespace' => 'Address Route::get('district/list', 'ListDistrictsController@list')->name('district.list'); + Route::get('state/list', 'ListStatesController@list')->name('state.list'); + Route::post('/create', 'CreateAddressController@create')->name('create'); Route::put('/update/{id}', 'UpdateAddressController@update')->name('update'); From fa29de775c0fc818ff15695df34d85ba02794f62 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Mon, 21 Feb 2022 20:00:09 +0800 Subject: [PATCH 18/20] update bugs --- .../components/settings/forms/EditStateChargesFormComponent.vue | 2 +- routes/web.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/assets/vue/components/settings/forms/EditStateChargesFormComponent.vue b/resources/assets/vue/components/settings/forms/EditStateChargesFormComponent.vue index ee32bf93..ac4052c6 100644 --- a/resources/assets/vue/components/settings/forms/EditStateChargesFormComponent.vue +++ b/resources/assets/vue/components/settings/forms/EditStateChargesFormComponent.vue @@ -37,7 +37,7 @@ export default { props: { data: { - type: String, + type: Object, required: false }, section: { diff --git a/routes/web.php b/routes/web.php index 2f5f245c..e29f6333 100644 --- a/routes/web.php +++ b/routes/web.php @@ -81,7 +81,7 @@ Route::get('/warehouse-list', function () { Route::get('/unclaimed-packinglist', function () { return view('pages.unclaimed_packinglist'); -})->name('warehouse.list'); +})->name('unclaimed-packinglist.list'); Route::get('/containers', function () { return view('pages.containers'); From b5b2ba59af8e18c1f0c731730efced8ab915e7dd Mon Sep 17 00:00:00 2001 From: edmondlang Date: Mon, 21 Feb 2022 20:34:25 +0800 Subject: [PATCH 19/20] add warehouse charges in settings --- app/Http/Resources/CompanyResource.php | 6 +- .../elements/WarehouseChargesComponent.vue | 65 +++++++++++++++++++ .../EditWarehouseChargesFormComponent.vue | 54 +++++++++++++++ resources/views/pages/settings.blade.php | 45 +++++++++++++ 4 files changed, 167 insertions(+), 3 deletions(-) create mode 100644 resources/assets/vue/components/settings/elements/WarehouseChargesComponent.vue create mode 100644 resources/assets/vue/components/settings/forms/EditWarehouseChargesFormComponent.vue diff --git a/app/Http/Resources/CompanyResource.php b/app/Http/Resources/CompanyResource.php index 38459a35..6d16651b 100644 --- a/app/Http/Resources/CompanyResource.php +++ b/app/Http/Resources/CompanyResource.php @@ -28,10 +28,10 @@ class CompanyResource extends JsonResource 'business_type' => (int) $this->business_type, 'status' => (int) $this->status, 'contact' => new ContactResource ($this->when($this->has('contacts'), $this->contacts->first())), - 'employee' => new UserResource($companyModule->employees()->first()), + 'employee' => (int) $this->business_type == 1 ? new UserResource($companyModule->employees()->first()) : '', 'company_module' => new CompanyModuleResource($companyModule), - 'last_order' => new OrderResource($companyModule ? $companyModule->orders()->orderBy('id', 'DESC')->first(): null), - 'order_count' => $this->orders()->count(), + 'last_order' => (int) $this->business_type == 1 ? new OrderResource($companyModule ? $companyModule->orders()->orderBy('id', 'DESC')->first(): null) : '', + 'order_count' => (int) $this->business_type == 1 ? $this->orders()->count() : '', 'identification' => new DocumentResource($this->documents->whereIn('document_type', DocumentType::IDENTIFICATION_DOCUMENTS)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED])->first()), 'created_at' => $this->created_at->format('d-m-Y') diff --git a/resources/assets/vue/components/settings/elements/WarehouseChargesComponent.vue b/resources/assets/vue/components/settings/elements/WarehouseChargesComponent.vue new file mode 100644 index 00000000..59611841 --- /dev/null +++ b/resources/assets/vue/components/settings/elements/WarehouseChargesComponent.vue @@ -0,0 +1,65 @@ + + \ No newline at end of file diff --git a/resources/assets/vue/components/settings/forms/EditWarehouseChargesFormComponent.vue b/resources/assets/vue/components/settings/forms/EditWarehouseChargesFormComponent.vue new file mode 100644 index 00000000..a078576f --- /dev/null +++ b/resources/assets/vue/components/settings/forms/EditWarehouseChargesFormComponent.vue @@ -0,0 +1,54 @@ + + \ No newline at end of file diff --git a/resources/views/pages/settings.blade.php b/resources/views/pages/settings.blade.php index c23c31b5..b6d89f9f 100644 --- a/resources/views/pages/settings.blade.php +++ b/resources/views/pages/settings.blade.php @@ -147,6 +147,26 @@ +
+
+
+
+
+
+
+
+ +
+
+
Warehouse Charges
+
+
+
+
+
+
+
+
@@ -392,6 +412,31 @@ +
+
+ +
+
+
+
+
+ Warehouse Charges +
+
+
+
+
+ + + +
+
+
+
+
+
From 7146600376e643d29ccd23bda323b3a50904a73c Mon Sep 17 00:00:00 2001 From: edmondlang Date: Mon, 21 Feb 2022 20:53:55 +0800 Subject: [PATCH 20/20] update service configuration form component --- .../settings/forms/ServiceFormComponent.vue | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/resources/assets/vue/components/settings/forms/ServiceFormComponent.vue b/resources/assets/vue/components/settings/forms/ServiceFormComponent.vue index 002488cc..eac2a388 100644 --- a/resources/assets/vue/components/settings/forms/ServiceFormComponent.vue +++ b/resources/assets/vue/components/settings/forms/ServiceFormComponent.vue @@ -22,7 +22,7 @@ -
+
@@ -59,11 +59,17 @@
-
+ +
+ + + +
@@ -82,14 +88,14 @@
-
+
-
+
@@ -103,7 +109,7 @@
-
+
** Abandoned PO's limit is only applicable to transfers that have been paid in full.