From 276a87ff0d30164027f6b81b5d554e025fc2391b Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sun, 27 Mar 2022 12:49:08 +0800 Subject: [PATCH 01/69] temp test vt warehouse list --- ...ehouseReceiveListFromVTPortalProcessor.php | 5 +++-- routes/web.php | 21 ++++++++++--------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php index fc15e580..1b6a1ce5 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php @@ -131,13 +131,14 @@ class FetchWarehouseReceiveListFromVTPortalProcessor $warehouseListRequest = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"WarehouseList","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ParcelDate asc","Filter":'.$filter.'}}'), ''); $response = $this->fetchesDataFRomVTPortal->getResponseBody($warehouseListRequest); - + dd($response->Rows); foreach ($response->Rows as $parcel){ + dd($parcel); $marking = preg_split('(-|\(|\)|\/)', str_replace("/YW","", $parcel[5])); - $orderNumber = $marking[array_key_last($marking)]; + continue; if(!$parcel[9]){ continue; } diff --git a/routes/web.php b/routes/web.php index 9bcda09f..dc9d15f1 100644 --- a/routes/web.php +++ b/routes/web.php @@ -110,22 +110,23 @@ Route::get('/customer/{marking}/details', function ($marking) { })->name('customer.profile.details'); Route::get('/orders/refresh', function(){ + (App()->make(\App\Classes\Modules\PackingLists\Processors\FetchWarehouseReceiveListFromVTPortalProcessor::class))->execute(); +// FetchWarehouseReceiveListFromVTPortalJob::dispatch(); +// FetchWarehouseReceiveListFromVTPortalJob::withChain([ +// new FetchLoadedContainersFromVTPortalJob, +// new FetchPackingListFromVTPortalJob, +// new FetchContainersStatusUpdateFromVTPortalJob, +// new FetchDeliveryListFromVTPortalJob, +// new FetchOrdersFromYDPortalJob +// ])->dispatch(); - FetchWarehouseReceiveListFromVTPortalJob::withChain([ - new FetchLoadedContainersFromVTPortalJob, - new FetchPackingListFromVTPortalJob, - new FetchContainersStatusUpdateFromVTPortalJob, - new FetchDeliveryListFromVTPortalJob, - new FetchOrdersFromYDPortalJob - ])->dispatch(); - - return redirect('orders'); +// return redirect('orders'); })->name('orders.refresh'); Route::get('/containers/refresh', function(){ - (App()->make(\App\Classes\Modules\PackingLists\Processors\FetchPackingListFromVTPortalProcessor::class))->execute(); + (App()->make(\App\Classes\Modules\PackingLists\Processors\FetchWarehouseReceiveListFromVTPortalProcessor::class))->execute(); // FetchLoadedContainersFromVTPortalJob::dispatch(); // FetchContainersStatusUpdateFromVTPortalJob::dispatch(); From eb417cf389a99158c3315a1f826f5e762a753cf9 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sun, 27 Mar 2022 12:50:23 +0800 Subject: [PATCH 02/69] temp test vt warehouse list --- .../FetchWarehouseReceiveListFromVTPortalProcessor.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php index 1b6a1ce5..8e6f9bf1 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php @@ -131,13 +131,13 @@ class FetchWarehouseReceiveListFromVTPortalProcessor $warehouseListRequest = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"WarehouseList","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ParcelDate asc","Filter":'.$filter.'}}'), ''); $response = $this->fetchesDataFRomVTPortal->getResponseBody($warehouseListRequest); - dd($response->Rows); + foreach ($response->Rows as $parcel){ - dd($parcel); $marking = preg_split('(-|\(|\)|\/)', str_replace("/YW","", $parcel[5])); $orderNumber = $marking[array_key_last($marking)]; + dd($orderNumber); continue; if(!$parcel[9]){ continue; From caf8624d4c19d9ad40a8ce1679850b5e472bf267 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sun, 27 Mar 2022 12:51:43 +0800 Subject: [PATCH 03/69] temp test vt warehouse list --- .../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 8e6f9bf1..1b638e3d 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php @@ -137,7 +137,7 @@ class FetchWarehouseReceiveListFromVTPortalProcessor $marking = preg_split('(-|\(|\)|\/)', str_replace("/YW","", $parcel[5])); $orderNumber = $marking[array_key_last($marking)]; - dd($orderNumber); + dump($orderNumber); continue; if(!$parcel[9]){ continue; From 43f3fbff070d6d9939edc13b3d8aa7952398a47f Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sun, 27 Mar 2022 12:54:06 +0800 Subject: [PATCH 04/69] temp test vt warehouse list --- .../FetchWarehouseReceiveListFromVTPortalProcessor.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php index 1b638e3d..d888458e 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php @@ -137,13 +137,11 @@ class FetchWarehouseReceiveListFromVTPortalProcessor $marking = preg_split('(-|\(|\)|\/)', str_replace("/YW","", $parcel[5])); $orderNumber = $marking[array_key_last($marking)]; - dump($orderNumber); - continue; if(!$parcel[9]){ continue; } - +dd($orderNumber); try { $order = $this->fetchesOrder->execute(['reference' => $orderNumber]); } catch (ResourceNotFoundException $exception) { From 8b6db1fb68b8c30f01a3a0d9cd824dff1d526c35 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sun, 27 Mar 2022 12:55:06 +0800 Subject: [PATCH 05/69] temp test vt warehouse list --- .../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 d888458e..55b50b93 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php @@ -141,7 +141,7 @@ class FetchWarehouseReceiveListFromVTPortalProcessor continue; } -dd($orderNumber); +dump($orderNumber); try { $order = $this->fetchesOrder->execute(['reference' => $orderNumber]); } catch (ResourceNotFoundException $exception) { From 32476afdd4ef7a0bb7c5353a977679b0e7916a69 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sun, 27 Mar 2022 12:56:31 +0800 Subject: [PATCH 06/69] fix vt warehouse list --- ...ehouseReceiveListFromVTPortalProcessor.php | 1 - routes/web.php | 19 +++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php index 55b50b93..c8d126a5 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php @@ -141,7 +141,6 @@ class FetchWarehouseReceiveListFromVTPortalProcessor continue; } -dump($orderNumber); try { $order = $this->fetchesOrder->execute(['reference' => $orderNumber]); } catch (ResourceNotFoundException $exception) { diff --git a/routes/web.php b/routes/web.php index dc9d15f1..31c961b1 100644 --- a/routes/web.php +++ b/routes/web.php @@ -110,17 +110,16 @@ Route::get('/customer/{marking}/details', function ($marking) { })->name('customer.profile.details'); Route::get('/orders/refresh', function(){ - (App()->make(\App\Classes\Modules\PackingLists\Processors\FetchWarehouseReceiveListFromVTPortalProcessor::class))->execute(); -// FetchWarehouseReceiveListFromVTPortalJob::dispatch(); -// FetchWarehouseReceiveListFromVTPortalJob::withChain([ -// new FetchLoadedContainersFromVTPortalJob, -// new FetchPackingListFromVTPortalJob, -// new FetchContainersStatusUpdateFromVTPortalJob, -// new FetchDeliveryListFromVTPortalJob, -// new FetchOrdersFromYDPortalJob -// ])->dispatch(); -// return redirect('orders'); + FetchWarehouseReceiveListFromVTPortalJob::withChain([ + new FetchLoadedContainersFromVTPortalJob, + new FetchPackingListFromVTPortalJob, + new FetchContainersStatusUpdateFromVTPortalJob, + new FetchDeliveryListFromVTPortalJob, + new FetchOrdersFromYDPortalJob + ])->dispatch(); + + return redirect('orders'); })->name('orders.refresh'); From c3cd8ae3a054e070587d5ec70c3f25d8b4455dbf Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 29 Mar 2022 23:35:27 +0800 Subject: [PATCH 07/69] debug do update --- .../Orders/Processors/ApproveChangeOrderAddressProcessor.php | 2 +- .../Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php b/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php index 5623e4db..9fe6c5a7 100644 --- a/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php +++ b/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php @@ -65,7 +65,7 @@ class ApproveChangeOrderAddressProcessor $address->owner->addresses()->update(['status' => ApprovalStatus::EXPIRED]); $appointee = $address->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id; - $appointee === 2 ? $this->updateDoFromVTPortalProcessor->execute($address) : $this->updateDoFromYDPortalProcessor->execute($address); + if($appointee === 2) $this->updateDoFromVTPortalProcessor->execute($address); } diff --git a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php index 9485b1c6..f6073567 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($vt_do->Rows); if ($vt_do) { foreach ($vt_do->Rows as $key => $row) { $vt_do_update = $this->fetchesDataFRomVTPortal->clientRequest( From 0c7e4d5785d9b1ad61d85e9642e0eb8070df0a9c Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 29 Mar 2022 23:38:33 +0800 Subject: [PATCH 08/69] debug do update --- .../Orders/Processors/UpdateDoFromVTPortalProcessor.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php index f6073567..bcc1ee9a 100644 --- a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php +++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php @@ -74,9 +74,13 @@ 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($vt_do->Rows); + if ($vt_do) { foreach ($vt_do->Rows as $key => $row) { + if ($row[4] === $packing_list->container->reference) { + dd($row); + } + continue; $vt_do_update = $this->fetchesDataFRomVTPortal->clientRequest( 'http://portal.vtnation.com.my/Services/DataControllerService.asmx/Execute', 'POST', From c0ee3a8e570ea4b27c86f14cd623cf5b0d45b4c0 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 29 Mar 2022 23:39:28 +0800 Subject: [PATCH 09/69] debug do update --- .../Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php index bcc1ee9a..2a579cf4 100644 --- a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php +++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php @@ -77,6 +77,7 @@ class UpdateDoFromVTPortalProcessor if ($vt_do) { foreach ($vt_do->Rows as $key => $row) { + dd($packing_list->container->reference); if ($row[4] === $packing_list->container->reference) { dd($row); } From 7a2a90545b3d5d9ceb3bf5dab99192d311ee191e Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 29 Mar 2022 23:40:05 +0800 Subject: [PATCH 10/69] debug do update --- .../Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php index 2a579cf4..8a1e5b16 100644 --- a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php +++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php @@ -76,6 +76,7 @@ class UpdateDoFromVTPortalProcessor $vt_do = $this->fetchesDataFRomVTPortal->getResponseBody($vt_do); if ($vt_do) { + dd($vt_do->Rows); foreach ($vt_do->Rows as $key => $row) { dd($packing_list->container->reference); if ($row[4] === $packing_list->container->reference) { From 73010ed32b305d5726ad833e81385019f6288284 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 29 Mar 2022 23:40:20 +0800 Subject: [PATCH 11/69] debug do update --- .../Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php index 8a1e5b16..bcd6276c 100644 --- a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php +++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php @@ -147,6 +147,7 @@ class UpdateDoFromVTPortalProcessor } } catch (\Exception $exception){ + dd($exception); return []; } From 63badc08f01f1b524d0e2e4a97ed13591339c981 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 29 Mar 2022 23:41:34 +0800 Subject: [PATCH 12/69] debug do update --- .../Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php index bcd6276c..47c83c62 100644 --- a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php +++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php @@ -76,7 +76,6 @@ class UpdateDoFromVTPortalProcessor $vt_do = $this->fetchesDataFRomVTPortal->getResponseBody($vt_do); if ($vt_do) { - dd($vt_do->Rows); foreach ($vt_do->Rows as $key => $row) { dd($packing_list->container->reference); if ($row[4] === $packing_list->container->reference) { From 74d85eee60498773d07552e67d469ef8226b8e8c Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 29 Mar 2022 23:42:32 +0800 Subject: [PATCH 13/69] debug do update --- .../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 47c83c62..eb386ea6 100644 --- a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php +++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php @@ -77,7 +77,7 @@ class UpdateDoFromVTPortalProcessor if ($vt_do) { foreach ($vt_do->Rows as $key => $row) { - dd($packing_list->container->reference); + dd($packing_list->containers()->first()->reference); if ($row[4] === $packing_list->container->reference) { dd($row); } From 709534ce04e2abc445385742dffa57c7707a90f3 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 29 Mar 2022 23:43:29 +0800 Subject: [PATCH 14/69] debug do update --- .../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 eb386ea6..04e6d627 100644 --- a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php +++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php @@ -77,8 +77,7 @@ class UpdateDoFromVTPortalProcessor if ($vt_do) { foreach ($vt_do->Rows as $key => $row) { - dd($packing_list->containers()->first()->reference); - if ($row[4] === $packing_list->container->reference) { + if ($row[4] === $packing_list->containers()->first()->reference) { dd($row); } continue; From 55513f5175b019198f2f3cf5e11102ddeccc7e2f Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 29 Mar 2022 23:44:22 +0800 Subject: [PATCH 15/69] debug do update --- .../Orders/Processors/UpdateDoFromVTPortalProcessor.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php index 04e6d627..07dc4830 100644 --- a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php +++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php @@ -77,10 +77,6 @@ class UpdateDoFromVTPortalProcessor if ($vt_do) { foreach ($vt_do->Rows as $key => $row) { - if ($row[4] === $packing_list->containers()->first()->reference) { - dd($row); - } - continue; $vt_do_update = $this->fetchesDataFRomVTPortal->clientRequest( 'http://portal.vtnation.com.my/Services/DataControllerService.asmx/Execute', 'POST', From 2bdfd2772a776f4ba7afeed82694d612ae3aafb5 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 29 Mar 2022 23:54:14 +0800 Subject: [PATCH 16/69] debug do update --- .../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 07dc4830..1d23e29a 100644 --- a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php +++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php @@ -70,7 +70,7 @@ class UpdateDoFromVTPortalProcessor if (in_array($packing_list->status, [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) { $status = 'Release'; } - +dd($status); $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); From 79678d7b93dd25a28ef64c321cb4939c7ca6f278 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 29 Mar 2022 23:56:01 +0800 Subject: [PATCH 17/69] debug do update --- .../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 1d23e29a..07dc4830 100644 --- a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php +++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php @@ -70,7 +70,7 @@ class UpdateDoFromVTPortalProcessor if (in_array($packing_list->status, [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) { $status = 'Release'; } -dd($status); + $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); From b9523fb5674ba14ba337fb646c55082dd5a43ca6 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 29 Mar 2022 23:56:31 +0800 Subject: [PATCH 18/69] debug do update --- .../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 07dc4830..1d23e29a 100644 --- a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php +++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php @@ -70,7 +70,7 @@ class UpdateDoFromVTPortalProcessor if (in_array($packing_list->status, [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) { $status = 'Release'; } - +dd($status); $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); From adcdf5909e39f6fad1cbda85c18e75f1b712d467 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 29 Mar 2022 23:57:16 +0800 Subject: [PATCH 19/69] debug do update --- .../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 1d23e29a..18f7b5f7 100644 --- a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php +++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php @@ -70,7 +70,7 @@ class UpdateDoFromVTPortalProcessor if (in_array($packing_list->status, [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) { $status = 'Release'; } -dd($status); +dd($packing_list->status); $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); From 69ee0eea2cfeda601e308efbb97770e894619510 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 30 Mar 2022 00:05:45 +0800 Subject: [PATCH 20/69] debug do update --- .../ControllersLogic/UpdatePackingListStatusLogic.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php index 19b70a55..46bf7485 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 $packingList = $this->fetchesPackingList->execute(['id' => $request->route('id')]); $packing_list = $this->updatesPackingListStatus->execute($packingList, $request->route('status')); + dd($packing_list); $address = $packing_list->owner()->first()->addresses()->where('status', ApprovalStatus::APPROVED)->first(); From e8990d96f75318466fbcb4e147019222e4204cca Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 30 Mar 2022 00:06:22 +0800 Subject: [PATCH 21/69] debug do update --- .../ControllersLogic/UpdatePackingListStatusLogic.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php index 46bf7485..19b70a55 100644 --- a/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php +++ b/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php @@ -71,7 +71,6 @@ class UpdatePackingListStatusLogic extends AbstractControllerLogic $packingList = $this->fetchesPackingList->execute(['id' => $request->route('id')]); $packing_list = $this->updatesPackingListStatus->execute($packingList, $request->route('status')); - dd($packing_list); $address = $packing_list->owner()->first()->addresses()->where('status', ApprovalStatus::APPROVED)->first(); From 8f0d1e6fdfd4d0f0fbcd954c280338eb6fbbe8c7 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 30 Mar 2022 00:19:22 +0800 Subject: [PATCH 22/69] fix do update bug --- .../UpdateDoFromVTPortalProcessor.php | 30 +++---------- .../UpdateDoFromYDPortalProcessor.php | 43 +++++++++---------- .../UpdatePackingListStatusLogic.php | 11 ++--- 3 files changed, 33 insertions(+), 51 deletions(-) diff --git a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php index 18f7b5f7..500964a5 100644 --- a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php +++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php @@ -2,27 +2,12 @@ namespace App\Classes\Modules\Orders\Processors; -use App\Classes\Exceptions\InternalServerErrorException; use App\Classes\Modules\Orders\Services\FetchesDataFromVTPortal; use App\Classes\Modules\Addresses\Services\FetchesAddress; -use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject; -use App\Classes\Modules\Schedules\Services\CreatesSchedule; -use App\Classes\Modules\Transports\DataTransferObjects\TransportObject; -use App\Classes\Modules\Transports\Services\CreatesTransport; -use App\Classes\Modules\Unity\Services\UpdatesContractObligation; use App\Classes\ValueObjects\Constants\ApprovalStatus; -use App\Classes\ValueObjects\Constants\OrderRoleTypes; -use App\Classes\ValueObjects\Constants\PackingListType; -use App\Classes\ValueObjects\Constants\TransportType; use App\Models\PackingList; -use App\Models\Transport; -use Carbon\Carbon; use GuzzleHttp\Exception\GuzzleException; -use Illuminate\Support\Facades\Log; - -use Illuminate\Http\Request; - class UpdateDoFromVTPortalProcessor { /** @var FetchesDataFromVTPortal */ @@ -43,19 +28,18 @@ class UpdateDoFromVTPortalProcessor } /** - * @param $address + * @param PackingList $packing_list * @return array * @throws GuzzleException */ - public function execute($address) { + public function execute(PackingList $packing_list) { if(!app()->environment(['production'])){ return []; } try { - $order = $address->owner()->orderBy('id', 'desc')->first(); - $packing_list = $order->packingLists()->orderBy('id', 'desc')->first(); + $address= $packing_list->owner->addresses()->where('status', ApprovalStatus::APPROVED)->first(); if ($packing_list) { $contact = $address->contacts()->first(); @@ -67,16 +51,17 @@ class UpdateDoFromVTPortalProcessor $status = 'On Hold'; - if (in_array($packing_list->status, [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) { + if (in_array($packing_list->status, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) { $status = 'Release'; } -dd($packing_list->status); + $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( 'http://portal.vtnation.com.my/Services/DataControllerService.asmx/Execute', 'POST', @@ -141,8 +126,7 @@ dd($packing_list->status); } } catch (\Exception $exception){ - dd($exception); - return []; + throw new InternalServerErrorException('failed to approve address due to an error related to YD portal'); } } diff --git a/app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php b/app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php index 1404f149..9e9e6fe6 100644 --- a/app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php +++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php @@ -8,6 +8,7 @@ use App\Classes\Modules\Addresses\Services\FetchesAddress; use App\Classes\ValueObjects\Constants\ApprovalStatus; use App\Classes\ValueObjects\Constants\PackingListType; +use App\Models\PackingList; use Illuminate\Support\Facades\Log; class UpdateDoFromYDPortalProcessor @@ -30,36 +31,34 @@ class UpdateDoFromYDPortalProcessor } /** - * @param $address + * @param PackingList $packingList * @return void * @throws InternalServerErrorException */ - public function execute($address) { + public function execute(PackingList $packingList) { + if(!app()->environment(['production'])){ + return; + } + try { - $order = $address->owner()->orderBy('id', 'desc')->first(); - $packing_lists = $order->packingLists() - ->where('type', PackingListType::SHIPPING_PACKING_LIST) - ->where('status', '!=', ApprovalStatus::SUSPENDED) - ->orderBy('id', 'desc')->get(); + $address = $packingList->owner->addresses()->where('status', ApprovalStatus::APPROVED)->first(); + if (!in_array($packingList->status, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) { + return; + } - foreach ($packing_lists as $key => $row) { - if ($row->status === ApprovalStatus::SUSPENDED) { - continue; - } + $contact = $address->contacts()->first(); + $remark = $address->remarks()->first(); - $contact = $address->contacts()->first(); - $remark = $address->remarks()->first(); + $phone = $contact ? $contact->phone : null; + $reference = $contact ? $contact->reference : null; + $remark = $remark ? $remark->content : 'URGENT!!! PLEASE CALL BEFORE ONE DAY DELIVERY.'; - $phone = $contact ? $contact->phone : null; - $reference = $contact ? $contact->reference : null; - $remark = $remark ? $remark->content : 'URGENT!!! PLEASE CALL BEFORE ONE DAY DELIVERY.'; - - $this->fetchesDataFRomYDPortal->clientRequest( - 'http://www.yd-wl.com/api/UpdateOrderAddress.ashx', - 'POST', + $this->fetchesDataFRomYDPortal->clientRequest( + 'http://www.yd-wl.com/api/UpdateOrderAddress.ashx', + 'POST', [ - 'expressno' => $row->reference, + 'expressno' => $packingList->reference, 'customers_name' => $reference, 'cellphone' => $phone, 'postcode' => $address->postcode, @@ -68,8 +67,6 @@ class UpdateDoFromYDPortalProcessor ]); - } - } catch (\Exception $exception){ throw new InternalServerErrorException('failed to approve address due to an error related to YD portal'); } diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php index 19b70a55..306866aa 100644 --- a/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php +++ b/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php @@ -14,6 +14,7 @@ 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 App\Models\PackingList; use ErrorException; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; @@ -70,16 +71,16 @@ 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()->where('status', ApprovalStatus::APPROVED)->first(); + /** @var PackingList $packingList */ + $packingList = $this->updatesPackingListStatus->execute($packingList, $request->route('status')); // $appointee = $address->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id; - $this->updateDoFromVTPortalProcessor->execute($address); - $this->updateDoFromYDPortalProcessor->execute($address); + $this->updateDoFromVTPortalProcessor->execute($packingList); + $this->updateDoFromYDPortalProcessor->execute($packingList); - return $this->resourceResponse(new PackingListResource($packing_list)); + return $this->resourceResponse(new PackingListResource($packingList)); } } From b34f50ae9d86c809ddbe100b4d42cf949bbc7fb3 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 30 Mar 2022 00:20:11 +0800 Subject: [PATCH 23/69] fix do update bug --- .../Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php index 500964a5..e5b3f4a8 100644 --- a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php +++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php @@ -2,6 +2,7 @@ namespace App\Classes\Modules\Orders\Processors; +use App\Classes\Exceptions\InternalServerErrorException; use App\Classes\Modules\Orders\Services\FetchesDataFromVTPortal; use App\Classes\Modules\Addresses\Services\FetchesAddress; From 0b651953ea5a87955e3e30d25a8bcacf05b14a38 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 30 Mar 2022 00:20:24 +0800 Subject: [PATCH 24/69] fix do update bug --- .../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 e5b3f4a8..20c7ba04 100644 --- a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php +++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php @@ -127,7 +127,7 @@ class UpdateDoFromVTPortalProcessor } } catch (\Exception $exception){ - throw new InternalServerErrorException('failed to approve address due to an error related to YD portal'); + throw new InternalServerErrorException('failed to approve address due to an error related to VT portal'); } } From 012dbfde094c5f1c67efdfb937f2545b8d4564d8 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 30 Mar 2022 00:21:14 +0800 Subject: [PATCH 25/69] fix do update bug --- .../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 20c7ba04..3a3cf4cd 100644 --- a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php +++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php @@ -127,7 +127,7 @@ class UpdateDoFromVTPortalProcessor } } catch (\Exception $exception){ - throw new InternalServerErrorException('failed to approve address due to an error related to VT portal'); + throw new InternalServerErrorException('failed to approve address due to an error related to VT portal: '.$exception->getMessage()); } } From 92b31a9342c5bf078b94b698b075c465ded278b7 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 30 Mar 2022 00:22:05 +0800 Subject: [PATCH 26/69] fix do update bug --- .../Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php index 3a3cf4cd..798a6434 100644 --- a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php +++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php @@ -32,6 +32,7 @@ class UpdateDoFromVTPortalProcessor * @param PackingList $packing_list * @return array * @throws GuzzleException + * @throws InternalServerErrorException */ public function execute(PackingList $packing_list) { @@ -41,6 +42,7 @@ class UpdateDoFromVTPortalProcessor try { $address= $packing_list->owner->addresses()->where('status', ApprovalStatus::APPROVED)->first(); + $order = $packing_list->owner; if ($packing_list) { $contact = $address->contacts()->first(); From 7d84ddee950b2fe979769a21ec79a79e6d502414 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 30 Mar 2022 00:25:18 +0800 Subject: [PATCH 27/69] fix do update bug --- .../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 798a6434..da77ca4a 100644 --- a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php +++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php @@ -64,7 +64,7 @@ class UpdateDoFromVTPortalProcessor if ($vt_do) { foreach ($vt_do->Rows as $key => $row) { - + if($row[4] !== $packing_list->containers()->first()->reference) continue; $vt_do_update = $this->fetchesDataFRomVTPortal->clientRequest( 'http://portal.vtnation.com.my/Services/DataControllerService.asmx/Execute', 'POST', From 2d965009ec08b26ca1587427fd5bc9b2502a78d7 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 30 Mar 2022 11:31:40 +0800 Subject: [PATCH 28/69] move unclaimed packing lists to dashboard --- .../orders/elements/UnclaimedPackinglistComponent.vue | 9 +++++---- resources/views/pages/admin/dashboard.blade.php | 10 ++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue b/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue index eef618d7..ab09f62a 100644 --- a/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue +++ b/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue @@ -22,17 +22,18 @@

Arrival Date

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

-
+
+ + +
- - - + diff --git a/resources/views/pages/admin/dashboard.blade.php b/resources/views/pages/admin/dashboard.blade.php index ead4eed8..7f694bb9 100644 --- a/resources/views/pages/admin/dashboard.blade.php +++ b/resources/views/pages/admin/dashboard.blade.php @@ -44,6 +44,16 @@
+
+
+ + + + +
+
From dc562f6554b15130eec3ae64f9fb21117f01f499 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 31 Mar 2022 09:29:31 +0800 Subject: [PATCH 29/69] update holiday announcement --- .../CustomerProfileSectionComponent.vue | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue index 749e7ef8..b1a12a19 100644 --- a/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue +++ b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue @@ -6,6 +6,39 @@ +
From 4eded7a742f8d38c35240da57163ffdfdcd52a1b Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 31 Mar 2022 09:31:09 +0800 Subject: [PATCH 30/69] update holiday announcement --- .../companies/sections/CustomerProfileSectionComponent.vue | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue index b1a12a19..b10344e3 100644 --- a/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue +++ b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue @@ -6,11 +6,9 @@
-