diff --git a/app/Classes/Modules/Transactions/Processors/CheckStorageInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CheckStorageInvoiceTransactionProcessor.php index 9f4ac4ea..966afd4c 100644 --- a/app/Classes/Modules/Transactions/Processors/CheckStorageInvoiceTransactionProcessor.php +++ b/app/Classes/Modules/Transactions/Processors/CheckStorageInvoiceTransactionProcessor.php @@ -136,7 +136,8 @@ class CheckStorageInvoiceTransactionProcessor $transport = $receive_packing_list->transports->first(); if ($transport) { $arrivalDateAtChinaWarehouse = Carbon::parse($transport->drop_date); - $dateToCompare = Carbon::parse('2023-10-01 00:00:00'); //cief todo: to update this + $dateToCompare = Carbon::parse(env('STORAGE_FEE_LAUNCH_DATE', '2023-12-11 00:00:00')); + // dd($dateToCompare); if ($arrivalDateAtChinaWarehouse->isAfter($dateToCompare)) { Log::channel('storage_invoices')->info('transport: '.json_encode($transport)); Log::channel('storage_invoices')->info('dateToCompare: '.$dateToCompare.', arrivalDateAtChinaWarehouse: '.$arrivalDateAtChinaWarehouse); diff --git a/app/Console/Commands/CheckStorageInvoices.php b/app/Console/Commands/CheckStorageInvoicesGroupTransactions.php similarity index 94% rename from app/Console/Commands/CheckStorageInvoices.php rename to app/Console/Commands/CheckStorageInvoicesGroupTransactions.php index 0a4676f7..0a31c7d4 100644 --- a/app/Console/Commands/CheckStorageInvoices.php +++ b/app/Console/Commands/CheckStorageInvoicesGroupTransactions.php @@ -9,14 +9,14 @@ use App\Models\Order; use Carbon\Carbon; use Illuminate\Console\Command; -class CheckStorageInvoices extends Command +class CheckStorageInvoicesGroupTransaction extends Command { /** * The name and signature of the console command. * * @var string */ - protected $signature = 'command:check-storage-invoices'; + protected $signature = 'command:check-storage-invoices-group-transactions'; /** * The console command description. diff --git a/app/Console/Commands/CheckStorageInvoicesOrders.php b/app/Console/Commands/CheckStorageInvoicesOrders.php new file mode 100644 index 00000000..3b0b9cfc --- /dev/null +++ b/app/Console/Commands/CheckStorageInvoicesOrders.php @@ -0,0 +1,82 @@ +listsOrders = $listsOrders; + $this->storageInvoiceTransactionProcessor = $storageInvoiceTransactionProcessor; + } + + + /** + * Execute the console command. + * + * @return int + */ + public function handle() + { + ini_set('memory_limit', '-1'); + + $this->info(Carbon::now() . ': Start Check all orders for storage invoice.'); + $start = new Carbon(); + + $orders = $this->listsOrders->execute(['with_parcels' => true, 'type_in' => [OrderType::SHARED_CONTAINER, OrderType::DEDICATED_CONTAINER]]); + + $count = 0; + foreach ($orders as $order){ + try{ + $storages = $this->storageInvoiceTransactionProcessor->executeOrder($order); + $count = $count + 1; + $this->info('Order '.$count); + } + catch(\Exception $ex){ + $this->info('Exception '.$ex->getMessage()); + break; + } + } + + + $end = new Carbon(); + $elapsedTime = $start->diff($end)->format('%H:%I:%S'); + + $this->info(Carbon::now() . ': Done Check all orders for storage invoice. ElapsedTime: ' . $elapsedTime . '.'); + } +} diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 4d355110..1c034e6f 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -63,7 +63,7 @@ class Kernel extends ConsoleKernel ->withoutOverlapping() ->appendOutputTo (storage_path().'/logs/fix_failed_callback_from_billplz.log'); - $schedule->command('command:check-storage-invoices') + $schedule->command('command:check-storage-invoices-group-transactions') ->dailyAt('0:01') ->withoutOverlapping() ->appendOutputTo(storage_path().'/logs/check_storage_invoices.log');