diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php index 9b4aeaca..40eb347a 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php @@ -136,7 +136,7 @@ class FetchOrderListsFromYdPortalProcessor public function execute(?Carbon $start = null, ?Carbon $end = null) { try { - $start = $start ? $start : Carbon::now()->subMonths(1); + $start = $start ? $start : Carbon::now()->subMonths(3); $startLimit = Carbon::parse('01-12-2021'); diff --git a/app/Classes/ValueObjects/Constants/WarehouseReferences.php b/app/Classes/ValueObjects/Constants/WarehouseReferences.php index 8a95176b..702059b7 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, 2349]; + public const YD_EXEMPT_LIST = [230, 294, 320, 652, 1248, 1726, 2349, 2574]; public const REPLICA_WHITE_LIST = [502]; diff --git a/routes/web.php b/routes/web.php index fcddd2f0..b05569a5 100644 --- a/routes/web.php +++ b/routes/web.php @@ -288,8 +288,7 @@ Route::get('/settings', function () { Route::get('/customer/{company_module_id}/summary', 'Exports\ExportCompanyModuleSummaryController@export')->name('customer.summary.export'); Route::get('/customer/summary/monthly', function () { - $containers = Container::whereMonth('loading_date', '>', ((float)\Carbon\Carbon::now()->format('m') - 1))->whereYear('loading_date', \Carbon\Carbon::now()->format('Y'))->get(); -// $containers = Container::whereIn('reference', ['cs-6062', 'eps-3926', 'sh-1122', 'sh-1121', 'eps-3925', 'cs-6060', 'eps-3927', 'cs-6066', 'cs-6069'])->get(); + $containers = Container::whereMonth('loading_date', '>=', ((float)\Carbon\Carbon::now()->format('m') - 2))->whereYear('loading_date', (float)\Carbon\Carbon::now()->format('Y'))->get(); foreach ($containers as $container){ $packingLists = $container->packingLists()->get()->filter(function ($packingList) { return $packingList->owner->company_module_id === 248; @@ -297,7 +296,7 @@ Route::get('/customer/summary/monthly', function () { if (!count($packingLists)) continue; - echo '
| Date | Full Marking | @@ -316,7 +315,7 @@ Route::get('/customer/summary/monthly', function () { $packages = $packingList->packages; foreach ($packages as $package){ echo '|||
|---|---|---|---|---|
| - | +'.$container->loading_date->format('d-m-Y').' | MS/CIEF/769SMC/'.$packingList->owner->reference.' | '.$container->reference.' | '.$package->description.' |