diff --git a/app/Classes/Modules/Transactions/Processors/CreateInvoiceDocumentProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateInvoiceDocumentProcessor.php index 8bb2c797..98adfd88 100644 --- a/app/Classes/Modules/Transactions/Processors/CreateInvoiceDocumentProcessor.php +++ b/app/Classes/Modules/Transactions/Processors/CreateInvoiceDocumentProcessor.php @@ -47,9 +47,12 @@ class CreateInvoiceDocumentProcessor { // calculate current Paid Amount $booking = $transaction->owner_type == Booking::class ? $transaction->owner : null; + if(!$booking){ + $booking = $transaction->owner->owner_type == Booking::class ? $transaction->owner->owner : null; + } $currentPaidAmount = null; $brn = $supplier->documents->where('document_type', DocumentType::SSM_REGISTRATION)->first(); - $documentDate = $supplier->segments->whereIn('id', [23])->first() ? \Carbon\Carbon::now() : $purchaseOrder->booking->created_at; + $documentDate = $supplier->segments->whereIn('id', [23])->first() ? \Carbon\Carbon::now() : $booking->created_at; $eInvoiceStartDate = Carbon::parse(env('E_INVOICE_START_DATE', '2025-07-01 00:00:00')); if ($booking) { @@ -74,7 +77,7 @@ class CreateInvoiceDocumentProcessor $lowercaseDocumentType = strtolower($document_type); - $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]); //cief todo: 90 - autocount id to be updated + $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 if($purchaseOrder && $purchaseOrder->booking->service_id === 4) { $purchaseOrderDocuments = $purchaseOrder->booking->documents()->where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->get(); diff --git a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue index bf6a78d3..fc7b077e 100644 --- a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue +++ b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue @@ -512,7 +512,6 @@ let vm = this; var TotalRequestedRefund = 0; this.data.transaction_refunds.forEach(function(refund) { - console.log('refund: ' + JSON.stringify(refund)); TotalRequestedRefund += refund.status === 1 ? refund.amount : 0; }); // if (vm.data.booking.fixed_currency.id != 1 && this.data.transaction_refunds[0]) { diff --git a/resources/views/pages/pdfs/receipt_voucher.blade.php b/resources/views/pages/pdfs/receipt_voucher.blade.php index 64942f6f..d7380337 100644 --- a/resources/views/pages/pdfs/receipt_voucher.blade.php +++ b/resources/views/pages/pdfs/receipt_voucher.blade.php @@ -24,7 +24,7 @@
Receipt Voucher
EI#: {{ $transaction->bill_no }}
-
Ref# {{ $po_order_transaction->owner->marking }}
+
Ref# {{ $booking->marking ?? "-" }}
Date: {{ $transaction->created_at }}
 
@@ -97,7 +97,7 @@ - PAYMENT FOR REF. {{ $po_order_transaction->owner->marking ?? 'N/A' }} + PAYMENT FOR REF. {{ $booking->marking ?? 'N/A' }} {{ number_format($total, 2) }}