cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-19 04:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dillon/90-e-invoice-e' into vapor/development

Browse Source
This commit is contained in:
Dillon Ngo
2025-11-27 13:32:29 +08:00
parent d357ed5a65 34e7b37a7c
commit 3cc6331fdf
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Bookings/ControllersLogic/ApprovePurchaseOrderLogic.php
+6 -1
View File
@@ -67,7 +67,12 @@ class ApprovePurchaseOrderLogic extends AbstractControllerLogic
$this->updatesTransactionStatus->execute($purchaseOrder, ApprovalStatus::APPROVED);
$this->createInvoiceTransactionProcessor->execute($booking);
$this->createInvoiceTransactionProcessor->execute($booking, "", null, [
'generateEInvoice' => false,
'generateEInvoiceWithNormalInvoiceTemplate' => false,
'generateEInvoiceRefund' => false,
'bookingOriginalStatus' => $booking->status
]);
return $this->response([]);
}
app/Http/Resources/BookingResource.php
+1
View File
@@ -100,6 +100,7 @@ class BookingResource extends JsonResource
})->latest()->get())
]),
'einvoice' => $eInvoice,
'is_invoice_generated' => $this->is_invoice_generated,
];
}
}
resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
+2 -2
View File
@@ -21,7 +21,7 @@
<div class="col-md col-sm-12 m-b-20">
<div class="row" v-if="booking">
<div class="col" v-if="showDownloadPDFButtons">
<div class="row m-b-50" v-if="booking.status === 3 || isBookingWithAFullRefund">
<div class="row m-b-50" v-if="(booking.status === 3 || booking.is_invoice_generated) || isBookingWithAFullRefund">
<div class="col no-padding">
<div class="row">
<div class="col">
@@ -137,7 +137,7 @@
</div>
</div>
</div>
<div class="row m-b-10" v-if="booking.status !== 3 && !isBookingWithAFullRefund">
<div class="row m-b-10" v-if="booking.status !== 3 && !booking.is_invoice_generated && !isBookingWithAFullRefund">
<div class="col">
<div class="row text-center m-b-15">
<div class="col">