From 1796ddefbfb8a13781b35c63a4a7c289b85b621d Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 17 May 2022 11:45:13 +0800 Subject: [PATCH 1/6] fix export arrival list --- .../Modules/Exports/Services/ExportsArrivedParcel.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php index 72725cfb..faf3ea1a 100644 --- a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php +++ b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php @@ -4,6 +4,7 @@ namespace App\Classes\Modules\Exports\Services; use App\Models\Order; use App\Models\PackingList; +use Carbon\Carbon; use Maatwebsite\Excel\Concerns\Exportable; use Maatwebsite\Excel\Concerns\FromQuery; use Maatwebsite\Excel\Concerns\WithHeadingRow; @@ -36,7 +37,9 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, */ public function query() { - return PackingList::where('type', '=', 1)->where('status', '=', 2)->where('owner_type', Order::class); + return PackingList::where('type', '=', 1)->where('status', '=', 2)->where('owner_type', Order::class)->whereHas('transport', function($query){ + return $query->where('drop_date', Carbon::now()->subMonth()); + }); } /** From 918db70429fcf86323ab5e74c5b39cc0e300b72a Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 17 May 2022 11:46:24 +0800 Subject: [PATCH 2/6] fix export arrival list --- app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php index faf3ea1a..152217d6 100644 --- a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php +++ b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php @@ -37,7 +37,7 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, */ public function query() { - return PackingList::where('type', '=', 1)->where('status', '=', 2)->where('owner_type', Order::class)->whereHas('transport', function($query){ + return PackingList::where('type', '=', 1)->where('status', '=', 2)->where('owner_type', Order::class)->whereHas('transports', function($query){ return $query->where('drop_date', Carbon::now()->subMonth()); }); } From 35dec3042b23ae742dadfe72596ac156504c8116 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 17 May 2022 11:47:30 +0800 Subject: [PATCH 3/6] fix export arrival list --- app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php index 152217d6..45b42a45 100644 --- a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php +++ b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php @@ -38,7 +38,7 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, public function query() { return PackingList::where('type', '=', 1)->where('status', '=', 2)->where('owner_type', Order::class)->whereHas('transports', function($query){ - return $query->where('drop_date', Carbon::now()->subMonth()); + return $query->where('drop_date', '>=',Carbon::now()->subMonth()); }); } From 27940854e2b411aaf000f2bfbfc9278f9a9991f6 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 17 May 2022 17:26:09 +0800 Subject: [PATCH 4/6] add chi bin to vt --- app/Classes/ValueObjects/Constants/WarehouseReferences.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/ValueObjects/Constants/WarehouseReferences.php b/app/Classes/ValueObjects/Constants/WarehouseReferences.php index dbc781f4..8a95176b 100644 --- a/app/Classes/ValueObjects/Constants/WarehouseReferences.php +++ b/app/Classes/ValueObjects/Constants/WarehouseReferences.php @@ -43,7 +43,7 @@ final class WarehouseReferences { public const YD_DESTINATION_WAREHOUSE = self::YD_KLANG; - public const YD_EXEMPT_LIST = [230, 294, 320, 652, 1248, 1726]; + public const YD_EXEMPT_LIST = [230, 294, 320, 652, 1248, 1726, 2349]; public const REPLICA_WHITE_LIST = [502]; From 2a077edcde866d9b63dc39e3abd9d3593f9da27c Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 18 May 2022 16:41:15 +0800 Subject: [PATCH 5/6] update vt api url for new 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 c8d126a5..b5921ae3 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php @@ -128,7 +128,7 @@ class FetchWarehouseReceiveListFromVTPortalProcessor $filter = '["ParcelDate:$between$%js%\"'.$start->format('Y-m-d').'T00:00:00.000\"$and$%js%\"'.$end->format('Y-m-d').'T00:00:00.000\"\u0000"]'; - $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.'}}'), ''); + $warehouseListRequest = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"Parcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ParcelDate asc","Filter":'.$filter.'}}'), ''); $response = $this->fetchesDataFRomVTPortal->getResponseBody($warehouseListRequest); From 8e0d23a2080c2455b5f54e86d16d58d0d309ef54 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 18 May 2022 16:59:49 +0800 Subject: [PATCH 6/6] update yd fetch api to include delivery missing cases --- .../Processors/FetchOrderListsFromYdPortalProcessor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php index 1b409fc2..485e2f13 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php @@ -222,7 +222,7 @@ class FetchOrderListsFromYdPortalProcessor $unstuffingDate = Carbon::parse($trackingRow->trackingtime); } - if (Str::contains($trackingRow->tracking, ['派送中'])) { + if (Str::contains($trackingRow->tracking, ['派送中', '签收完成', ' 第三方提货', '货物已派送完成'])) { $deliveryDate = Carbon::parse($trackingRow->trackingtime); } }