mirror of
https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git
synced 2026-08-19 04:23:55 +00:00
E-Invoice - Update Sales Invoice Report + Sales Invoice Report (with refund) + Credit Note report
This commit is contained in:
@@ -115,8 +115,14 @@ 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();
|
||||
$docNo = $transactionKVP ? $transactionKVP->value :'<<New>>';
|
||||
}
|
||||
|
||||
return [
|
||||
'<<New>>', //DocNo
|
||||
$docNo, //DocNo
|
||||
$formattedDocumentDate, //DocDate
|
||||
$company->debtor, //DebtorCode
|
||||
$transaction->bill_no ?? '', //Ref
|
||||
|
||||
@@ -146,9 +146,12 @@ 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();
|
||||
$docNo = $invoiceTransactionKVP ? $invoiceTransactionKVP->value :'<<New>>';
|
||||
}
|
||||
|
||||
$transactionDetails = $purchaseOrder->transactionDetails;
|
||||
foreach ($transactionDetails as $detail) {
|
||||
|
||||
@@ -138,9 +138,12 @@ 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();
|
||||
$docNo = $invoiceTransactionKVP ? $invoiceTransactionKVP->value :'<<New>>';
|
||||
}
|
||||
|
||||
$transactionDetails = $purchaseOrder ? $purchaseOrder->transactionDetails : null;
|
||||
if($transactionDetails){
|
||||
|
||||
Reference in New Issue
Block a user