diff --git a/app/Classes/Modules/Exports/Services/ExportsARCreditNoteReport.php b/app/Classes/Modules/Exports/Services/ExportsARCreditNoteReport.php index 679f3003..6d0a7d42 100644 --- a/app/Classes/Modules/Exports/Services/ExportsARCreditNoteReport.php +++ b/app/Classes/Modules/Exports/Services/ExportsARCreditNoteReport.php @@ -115,8 +115,20 @@ class ExportsARCreditNoteReport implements FromQuery, WithHeadings, WithHeadingR } $formattedDocumentDate = Carbon::parse($documentDate)->format('m/d/Y'); + $docNo = '<>'; + 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 :'<>'; + } + } + return [ - '<>', //DocNo + $docNo, //DocNo $formattedDocumentDate, //DocDate $company->debtor, //DebtorCode $transaction->bill_no ?? '', //Ref diff --git a/app/Classes/Modules/Exports/Services/ExportsSalesInvoiceReport.php b/app/Classes/Modules/Exports/Services/ExportsSalesInvoiceReport.php index 6e6adfb3..c8e25404 100644 --- a/app/Classes/Modules/Exports/Services/ExportsSalesInvoiceReport.php +++ b/app/Classes/Modules/Exports/Services/ExportsSalesInvoiceReport.php @@ -146,9 +146,18 @@ class ExportsSalesInvoiceReport implements FromQuery, WithHeadings, WithHeadingR $formattedDocumentDate = Carbon::parse($documentDate)->format('m/d/Y'); + $docNo = '<>'; $firstItem = true; - $invoiceTransactionKVP = $invoiceTransaction->attributesKVP()->where('key', KVPKey::AUTOCOUNT_DOCNO_INVOICE)->first(); - $docNo = $invoiceTransactionKVP ? $invoiceTransactionKVP->value :'<>'; + 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 :'<>'; + } + } $transactionDetails = $purchaseOrder->transactionDetails; foreach ($transactionDetails as $detail) { diff --git a/app/Classes/Modules/Exports/Services/ExportsSalesInvoiceWithRefundReport.php b/app/Classes/Modules/Exports/Services/ExportsSalesInvoiceWithRefundReport.php index 6049655e..36e71484 100644 --- a/app/Classes/Modules/Exports/Services/ExportsSalesInvoiceWithRefundReport.php +++ b/app/Classes/Modules/Exports/Services/ExportsSalesInvoiceWithRefundReport.php @@ -154,9 +154,18 @@ class ExportsSalesInvoiceWithRefundReport implements FromQuery, WithHeadings, Wi $formattedDocumentDate = Carbon::parse($documentDate)->format('m/d/Y'); + $docNo = '<>'; $firstItem = true; - $invoiceTransactionKVP = $invoiceTransaction->attributesKVP()->where('key', KVPKey::AUTOCOUNT_DOCNO_INVOICE)->first(); - $docNo = $invoiceTransactionKVP ? $invoiceTransactionKVP->value :'<>'; + 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 :'<>'; + } + } $transactionDetails = $purchaseOrder ? $purchaseOrder->transactionDetails : null; if($transactionDetails){