From 2142440bf8f37aa0a3dffb0a23a7115a1223cc03 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Tue, 8 Jul 2025 09:44:14 +0800 Subject: [PATCH 1/2] E-Invoice - Emergency fix for admin unable to approve payment --- .../Transactions/Processors/CreateInvoiceDocumentProcessor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Transactions/Processors/CreateInvoiceDocumentProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateInvoiceDocumentProcessor.php index 98adfd88..d6911b37 100644 --- a/app/Classes/Modules/Transactions/Processors/CreateInvoiceDocumentProcessor.php +++ b/app/Classes/Modules/Transactions/Processors/CreateInvoiceDocumentProcessor.php @@ -77,7 +77,7 @@ class CreateInvoiceDocumentProcessor $lowercaseDocumentType = strtolower($document_type); - $order_pdf = LaravelMpdf::loadView('pages.pdfs.' . $lowercaseDocumentType, ['transaction' => $transaction, 'booking' => $booking, 'supplier' => $supplier, 'voucher_redemption' => $voucherRedemption, 'current_paid_amount' => $currentPaidAmount, 'document_date' => $documentDate, 'brn' => $brn, 'autocountId' => null]); //cief todo: 90 - autocount id to be updated + $order_pdf = LaravelMpdf::loadView('pages.pdfs.' . $lowercaseDocumentType, ['transaction' => $transaction, 'po_order_transaction' => $purchaseOrder, 'supplier' => $supplier, 'voucher_redemption' => $voucherRedemption, 'current_paid_amount' => $currentPaidAmount, 'document_date' => $documentDate, 'brn' => $brn, 'autocountId' => null, 'booking' => $booking]); //cief todo: 90 - autocount id to be updated if($purchaseOrder && $purchaseOrder->booking->service_id === 4) { $purchaseOrderDocuments = $purchaseOrder->booking->documents()->where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->get(); From 6dec15c1ac4305f26a18d49350bf07ba59831a59 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Fri, 11 Jul 2025 13:00:52 +0800 Subject: [PATCH 2/2] E-Invoice - Fix a deleted open currency orders mysteriously 'dissapear' permanently --- .../Modules/Transactions/ControllersLogic/DeleteGroupLogic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Transactions/ControllersLogic/DeleteGroupLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/DeleteGroupLogic.php index b2f92a35..50816be7 100644 --- a/app/Classes/Modules/Transactions/ControllersLogic/DeleteGroupLogic.php +++ b/app/Classes/Modules/Transactions/ControllersLogic/DeleteGroupLogic.php @@ -63,7 +63,7 @@ class DeleteGroupLogic extends AbstractControllerLogic $payment = $bill->owner; $group->transactions()->detach($bill->id); - $trns = $payment->transactions()->with('groupTransaction')->get(); + $trns = $payment->transactions()->where('type', 3)->with('groupTransaction')->get(); if(count($trns) <= 1){ $this->updatesTransactionStatus->execute($payment, ApprovalStatus::APPROVED); }