diff --git a/app/Classes/Modules/Exports/Services/ExportsReceivePaymentForBookingReport.php b/app/Classes/Modules/Exports/Services/ExportsReceivePaymentForBookingReport.php index cacbd43b..c8010325 100644 --- a/app/Classes/Modules/Exports/Services/ExportsReceivePaymentForBookingReport.php +++ b/app/Classes/Modules/Exports/Services/ExportsReceivePaymentForBookingReport.php @@ -80,9 +80,18 @@ class ExportsReceivePaymentForBookingReport implements FromQuery, WithHeadings, } if($booking){ - $metadata = $booking->attributesKVP()->where('key', KVPKey::AUTOCOUNT_DOCNO_INVOICE)->first(); - if($metadata){ - $autoCountSalesInvoiceId = $metadata->value; + $invoiceTransaction = $booking->transactions->where('type', TransactionType::INVOICE)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->first(); + if($invoiceTransaction){ + $invoiceTransactionKVP = $invoiceTransaction->attributesKVP()->where('key', KVPKey::AUTOCOUNT_DOCNO_INVOICE)->first(); + if($invoiceTransactionKVP){ + $autoCountSalesInvoiceId = $invoiceTransactionKVP->value; + } + else { + $metadata = $booking->attributesKVP()->where('key', KVPKey::AUTOCOUNT_DOCNO_INVOICE)->first(); + if($metadata){ + $autoCountSalesInvoiceId = $metadata->value; + } + } } }