cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-22 14:04:01 +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-10-13 13:11:24 +08:00
parent fb1db255f1 5065adbc3b
commit deb5731459
3 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Exports/Services/ExportsARCreditNoteReport.php
+13 -1
View File
@@ -115,8 +115,20 @@ class ExportsARCreditNoteReport implements FromQuery, WithHeadings, WithHeadingR
}
$formattedDocumentDate = Carbon::parse($documentDate)->format('m/d/Y');
$docNo = '<<New>>';
if($transaction){
$transactionKVP = $transaction->attributesKVP()->where('key', KVPKey::AUTOCOUNT_DOCNO_CREDIT_NOTE)->first();
if($transactionKVP){
$docNo = $transactionKVP->value;
}
else if($booking){
$bookingKVP = $booking->attributesKVP()->where('key', KVPKey::AUTOCOUNT_DOCNO_CREDIT_NOTE)->first();
$docNo = $bookingKVP ? $bookingKVP->value :'<<New>>';
}
}
return [
'<<New>>', //DocNo
$docNo, //DocNo
$formattedDocumentDate, //DocDate
$company->debtor, //DebtorCode
$transaction->bill_no ?? '', //Ref
app/Classes/Modules/Exports/Services/ExportsSalesInvoiceReport.php
+11 -2
View File
@@ -146,9 +146,18 @@ class ExportsSalesInvoiceReport implements FromQuery, WithHeadings, WithHeadingR
$formattedDocumentDate = Carbon::parse($documentDate)->format('m/d/Y');
$docNo = '<<New>>';
$firstItem = true;
$invoiceTransactionKVP = $invoiceTransaction->attributesKVP()->where('key', KVPKey::AUTOCOUNT_DOCNO_INVOICE)->first();
$docNo = $invoiceTransactionKVP ? $invoiceTransactionKVP->value :'<<New>>';
if($invoiceTransaction){
$invoiceTransactionKVP = $invoiceTransaction->attributesKVP()->where('key', KVPKey::AUTOCOUNT_DOCNO_INVOICE)->first();
if($invoiceTransactionKVP){
$docNo = $invoiceTransactionKVP->value;
}
else {
$bookingKVP = $booking->attributesKVP()->where('key', KVPKey::AUTOCOUNT_DOCNO_INVOICE)->first();
$docNo = $bookingKVP ? $bookingKVP->value :'<<New>>';
}
}
$transactionDetails = $purchaseOrder->transactionDetails;
foreach ($transactionDetails as $detail) {
app/Classes/Modules/Exports/Services/ExportsSalesInvoiceWithRefundReport.php
+11 -2
View File
@@ -154,9 +154,18 @@ class ExportsSalesInvoiceWithRefundReport implements FromQuery, WithHeadings, Wi
$formattedDocumentDate = Carbon::parse($documentDate)->format('m/d/Y');
$docNo = '<<New>>';
$firstItem = true;
$invoiceTransactionKVP = $invoiceTransaction->attributesKVP()->where('key', KVPKey::AUTOCOUNT_DOCNO_INVOICE)->first();
$docNo = $invoiceTransactionKVP ? $invoiceTransactionKVP->value :'<<New>>';
if($invoiceTransaction){
$invoiceTransactionKVP = $invoiceTransaction->attributesKVP()->where('key', KVPKey::AUTOCOUNT_DOCNO_INVOICE)->first();
if($invoiceTransactionKVP){
$docNo = $invoiceTransactionKVP->value;
}
else {
$bookingKVP = $booking->attributesKVP()->where('key', KVPKey::AUTOCOUNT_DOCNO_INVOICE)->first();
$docNo = $bookingKVP ? $bookingKVP->value :'<<New>>';
}
}
$transactionDetails = $purchaseOrder ? $purchaseOrder->transactionDetails : null;
if($transactionDetails){