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-f-3' into vapor/development

Browse Source
This commit is contained in:
Dillon Ngo
2025-12-29 12:52:35 +08:00
parent fb9f66092c 4f9cadcb65
commit 3be19f5cdb
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionV2Processor.php
-1
View File
@@ -138,7 +138,6 @@ class CreateInvoiceTransactionV2Processor
->where('type', TransactionType::PURCHASE_ORDER)
->complete()
->first();
if(!$purchaseOrder && $generateEInvoiceRefund){
$purchaseOrder = $booking->transactions()
->where('type', TransactionType::PURCHASE_ORDER)
app/Http/Resources/AutocountSalesInvoiceBookingDetailsResource.php
+1
View File
@@ -29,6 +29,7 @@ class AutocountSalesInvoiceBookingDetailsResource extends JsonResource
'UnitPrice' => $this['UnitPrice'],
'SubmitEinvoice' => $this['SubmitEinvoice'],
'ConsolidatedEinvoice' => $this['ConsolidatedEinvoice'],
'InvoiceStatus' => $this['InvoiceStatus'],
];
}
app/Http/Resources/AutocountSalesInvoiceBookingResource.php
+4
View File
@@ -120,6 +120,7 @@ class AutocountSalesInvoiceBookingResource extends JsonResource
'UnitPrice' => $displayUnitPrice ? number_format($displayUnitPrice, 2) : '0',
'SubmitEinvoice' => $firstItem ? 'T' : '',
'ConsolidatedEinvoice' => $firstItem ? ($company->e_invoice ? 'F' : 'T') : '',
'InvoiceStatus' => (string) $this->invoice_status,
];
$details->push($detail);
@@ -149,6 +150,7 @@ class AutocountSalesInvoiceBookingResource extends JsonResource
'UnitPrice' => $voucherDiscount ? number_format($voucherDiscount, 2): '0',
'SubmitEinvoice' => '',
'ConsolidatedEinvoice' => '',
'InvoiceStatus' => (string) $this->invoice_status,
];
$details->push($detail);
}
@@ -183,6 +185,7 @@ class AutocountSalesInvoiceBookingResource extends JsonResource
'UnitPrice' => $serviceCharge ? number_format($serviceCharge, 2) : '0',
'SubmitEinvoice' => '',
'ConsolidatedEinvoice' => '',
'InvoiceStatus' => (string) $this->invoice_status,
];
$details->push($detail);
// Service Charge - Ends
@@ -231,6 +234,7 @@ class AutocountSalesInvoiceBookingResource extends JsonResource
'UnitPrice' => $adjustment ? number_format($adjustment, 2) : '0',
'SubmitEinvoice' => '',
'ConsolidatedEinvoice' => '',
'InvoiceStatus' => (string) $this->invoice_status,
];
$details->push($detail);
}