diff --git a/app/Classes/Modules/Exports/Services/ExportsSalesInvoiceReport.php b/app/Classes/Modules/Exports/Services/ExportsSalesInvoiceReport.php index 8a083933..6e6adfb3 100644 --- a/app/Classes/Modules/Exports/Services/ExportsSalesInvoiceReport.php +++ b/app/Classes/Modules/Exports/Services/ExportsSalesInvoiceReport.php @@ -13,6 +13,7 @@ use Maatwebsite\Excel\Concerns\WithHeadings; use Maatwebsite\Excel\Concerns\WithMapping; use App\Classes\Modules\Bookings\Services\CalculatesBookingRefundAmount; use App\Classes\Modules\Bookings\Services\CalculatesBookingRefundServiceCharge; +use App\Classes\ValueObjects\Constants\KVPKey; use Carbon\Carbon; use Illuminate\Support\Facades\Log; @@ -146,6 +147,9 @@ class ExportsSalesInvoiceReport implements FromQuery, WithHeadings, WithHeadingR $formattedDocumentDate = Carbon::parse($documentDate)->format('m/d/Y'); $firstItem = true; + $invoiceTransactionKVP = $invoiceTransaction->attributesKVP()->where('key', KVPKey::AUTOCOUNT_DOCNO_INVOICE)->first(); + $docNo = $invoiceTransactionKVP ? $invoiceTransactionKVP->value :'<>'; + $transactionDetails = $purchaseOrder->transactionDetails; foreach ($transactionDetails as $detail) { $displayUnitPrice = 0; @@ -160,7 +164,7 @@ class ExportsSalesInvoiceReport implements FromQuery, WithHeadings, WithHeadingR $records[] = [ - $firstItem ? '<>' : '', + $firstItem ? $docNo : '', $formattedDocumentDate, $company->debtor, $invoiceTransaction->bill_no, diff --git a/app/Classes/Modules/Exports/Services/ExportsSalesInvoiceWithRefundReport.php b/app/Classes/Modules/Exports/Services/ExportsSalesInvoiceWithRefundReport.php index 513e94e5..6049655e 100644 --- a/app/Classes/Modules/Exports/Services/ExportsSalesInvoiceWithRefundReport.php +++ b/app/Classes/Modules/Exports/Services/ExportsSalesInvoiceWithRefundReport.php @@ -13,6 +13,7 @@ use Maatwebsite\Excel\Concerns\WithHeadings; use Maatwebsite\Excel\Concerns\WithMapping; use App\Classes\Modules\Bookings\Services\CalculatesBookingRefundAmount; use App\Classes\Modules\Bookings\Services\CalculatesBookingRefundServiceCharge; +use App\Classes\ValueObjects\Constants\KVPKey; use Carbon\Carbon; use Illuminate\Support\Facades\Log; @@ -154,6 +155,9 @@ class ExportsSalesInvoiceWithRefundReport implements FromQuery, WithHeadings, Wi $formattedDocumentDate = Carbon::parse($documentDate)->format('m/d/Y'); $firstItem = true; + $invoiceTransactionKVP = $invoiceTransaction->attributesKVP()->where('key', KVPKey::AUTOCOUNT_DOCNO_INVOICE)->first(); + $docNo = $invoiceTransactionKVP ? $invoiceTransactionKVP->value :'<>'; + $transactionDetails = $purchaseOrder ? $purchaseOrder->transactionDetails : null; if($transactionDetails){ foreach ($transactionDetails as $detail) { @@ -169,7 +173,7 @@ class ExportsSalesInvoiceWithRefundReport implements FromQuery, WithHeadings, Wi $records[] = [ - $firstItem ? '<>' : '', + $firstItem ? $docNo : '', $formattedDocumentDate, $company->debtor, $invoiceTransaction ? $invoiceTransaction->bill_no : '',