From 2e8ba4f630ed3ed3da38e2d6d0c683222f5c9a8a Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Thu, 30 Nov 2023 13:56:35 +0800 Subject: [PATCH] Fix an error to export payment transaction in excel file --- .../Exports/Services/ExportsPaymentTransactions.php | 7 ++++++- .../Processors/CheckStorageInvoiceTransactionProcessor.php | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsPaymentTransactions.php b/app/Classes/Modules/Exports/Services/ExportsPaymentTransactions.php index bf82e7e2..f354b51b 100644 --- a/app/Classes/Modules/Exports/Services/ExportsPaymentTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsPaymentTransactions.php @@ -103,7 +103,12 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading $container = $transaction->owner->containers()->first(); $order = $transaction->owner->owner; $company = $order->companyModule->company; - $shippingTransactionDetails = $transaction->transactionDetails()->where('reference', 'SHIPPING_FEE')->first(); + if($transaction->type === TransactionType::STORAGE_INVOICE){ + $shippingTransactionDetails = $transaction->transactionDetails()->where('reference', 'STORAGE_FEE')->first(); + } + else{ + $shippingTransactionDetails = $transaction->transactionDetails()->where('reference', 'SHIPPING_FEE')->first(); + } $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference; $contact = $order->companyModule->company->contacts->first(); $userName = $order->companyModule->employees()->first(); diff --git a/app/Classes/Modules/Transactions/Processors/CheckStorageInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CheckStorageInvoiceTransactionProcessor.php index 135a4637..f8909eb4 100644 --- a/app/Classes/Modules/Transactions/Processors/CheckStorageInvoiceTransactionProcessor.php +++ b/app/Classes/Modules/Transactions/Processors/CheckStorageInvoiceTransactionProcessor.php @@ -373,7 +373,7 @@ class CheckStorageInvoiceTransactionProcessor private function createStorageInvoiceTransactionDetails($invoice_transaction, PackingList $packing_list, $cbm, $price_cbm, $numberOfDays){ $object_detail = new TransactionDetailObject( - 'SHIPPING_FEE', + 'STORAGE_FEE', TransactionDetailType::STORAGE_FEE.' for '.$numberOfDays. ' days
'.round($packing_list->packages->where('type', '!=', PackageType::OVER_WEIGHT)->sum('quantity'), 3).' CTNS - '.round($cbm, 3).' CBM', $cbm, $price_cbm