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/111-manual-invoice-ba-2' into vapor/staging

Browse Source
This commit is contained in:
Dillon Ngo
2026-01-28 14:25:00 +08:00
parent 039f463b82 17622f4c93
commit e978d426ed
5 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Bookings/ControllersLogic/UpdateBookingAmountLogic.php
+8 -1
View File
@@ -139,7 +139,14 @@ class UpdateBookingAmountLogic extends AbstractControllerLogic
$this->updatesBookingInvoiceStatus->execute($booking, $updateBookingInvoiceStatusObject);
}
else{
$this->createInvoiceTransactionProcessor->execute($booking);
// $this->createInvoiceTransactionProcessor->execute($booking);
$this->createInvoiceTransactionProcessor->execute($booking, "", null, [
'generateEInvoice' => false,
'generateEInvoiceWithNormalInvoiceTemplate' => false,
'generateEInvoiceRefund' => false,
'bookingOriginalStatus' => $booking->status
]
);
}
return $this->resourceResponse(new BookingResource($booking));
app/Classes/Modules/Bookings/ControllersLogic/UpdateBookingAmountWithPOLogic.php
+8 -1
View File
@@ -130,7 +130,14 @@ class UpdateBookingAmountWithPOLogic extends AbstractControllerLogic
$this->updatesBookingInvoiceStatus->execute($booking, $updateBookingInvoiceStatusObject);
}
else{
$this->createInvoiceTransactionProcessor->execute($booking);
// $this->createInvoiceTransactionProcessor->execute($booking);
$this->createInvoiceTransactionProcessor->execute($booking, "", null, [
'generateEInvoice' => false,
'generateEInvoiceWithNormalInvoiceTemplate' => false,
'generateEInvoiceRefund' => false,
'bookingOriginalStatus' => $booking->status
]
);
}
$request->merge(['is_privilleged_update' => true]);
app/Classes/Modules/Exports/Services/ExportsSalesInvoiceReport.php
+1 -1
View File
@@ -221,7 +221,7 @@ class ExportsSalesInvoiceReport implements FromQuery, WithHeadings, WithHeadingR
$company->debtor,
$invoiceTransaction ? $invoiceTransaction->bill_no : '',
$booking->marking,
$category === 'Compensation Voucher' ? '1000-000' : '949-2000',
$category === 'Compensation Voucher' ? '920-0000' : '949-2000',
'PRODUCT NAME :',
$voucher->code,
'022',
app/Classes/Modules/Exports/Services/ExportsSalesInvoiceWithRefundReport.php
+1 -1
View File
@@ -221,7 +221,7 @@ class ExportsSalesInvoiceWithRefundReport implements FromQuery, WithHeadings, Wi
$company->debtor,
$invoiceTransaction ? $invoiceTransaction->bill_no : '',
$booking->marking,
$category === 'Compensation Voucher' ? '1000-000' : '949-2000',
$category === 'Compensation Voucher' ? '920-0000' : '949-2000',
'PRODUCT NAME :',
$voucher->code,
'022',
app/Http/Resources/BookingResource.php
+2
View File
@@ -66,6 +66,8 @@ class BookingResource extends JsonResource
'supplier_delivery_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::SUPPLIER_DELIVER_ORDER)->latest()->first()),
'proforma_invoice' => new DocumentResource($this->documents()->where('document_type', DocumentType::PROFORMA_INVOICE)->whereNotIn('status', [ApprovalStatus::REJECTED, ApprovalStatus::EXPIRED])->latest()->first()),
'ecommerce_purchase_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->latest()->first()),
'banking_invoice' => new DocumentResource($this->documents()->where('document_type', DocumentType::BANKING_INVOICE)->whereNotIn('status', [ApprovalStatus::REJECTED, ApprovalStatus::EXPIRED])->orderByDesc('id')->first()),
'delivery_order_banking' => new DocumentResource($this->documents()->where('document_type', DocumentType::DELIVER_ORDER_BANKING)->orderByDesc('id')->first()),
],
'order_reference_no' => $this->modelAttributes()->where('name', BookingAttributeNames::ORDER_REFERENCE_NO)->get()->map(function ($attr) {
return [