From 5c1a4536f6f822cd24b3b2f0e367ce91073840be Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Mon, 7 Jul 2025 23:15:13 +0800 Subject: [PATCH] Fix a problem reported by Yien where admin cannot approve an invoice --- .../Processors/ApproveShippingInvoiceTransactionProcessor.php | 4 +++- .../Processors/CheckStorageInvoiceTransactionProcessor.php | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/Classes/Modules/Transactions/Processors/ApproveShippingInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/ApproveShippingInvoiceTransactionProcessor.php index 2531f112..c3fb57bb 100644 --- a/app/Classes/Modules/Transactions/Processors/ApproveShippingInvoiceTransactionProcessor.php +++ b/app/Classes/Modules/Transactions/Processors/ApproveShippingInvoiceTransactionProcessor.php @@ -84,7 +84,9 @@ class ApproveShippingInvoiceTransactionProcessor $order = $packingList->owner()->first(); if($order instanceof Order){ - $this->storageInvoiceTransactionProcessor->executeOrder($order); + // $this->storageInvoiceTransactionProcessor->executeOrder($order); + $is_credit_term = $order->companyModule->inviters()->withPivot('is_credit_term')->first()->pivot->is_credit_term; + $this->storageInvoiceTransactionProcessor->processByPackingList($packingList, $order, $is_credit_term); } return; diff --git a/app/Classes/Modules/Transactions/Processors/CheckStorageInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CheckStorageInvoiceTransactionProcessor.php index 93d80c14..9e5b9ee0 100644 --- a/app/Classes/Modules/Transactions/Processors/CheckStorageInvoiceTransactionProcessor.php +++ b/app/Classes/Modules/Transactions/Processors/CheckStorageInvoiceTransactionProcessor.php @@ -153,6 +153,10 @@ class CheckStorageInvoiceTransactionProcessor return $results; } + public function processByPackingList(PackingList $packingList, Order $order, bool $is_credit_term){ + $this->getResults($packingList, $order, $is_credit_term); + } + private function getResults($packingList, $order, $is_credit_term){ $results = []; $arrivalDateAtChinaWarehouse = $this->getArrivalDateAtChinaWarehoue($packingList);