cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-21 21:43:57 +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 12:11:04 +08:00
parent 78a0b0f4e9 92ed3088bc
commit fb1db255f1
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Exports/Services/ExportsSalesInvoiceReport.php
+5 -1
View File
@@ -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 :'<<New>>';
$transactionDetails = $purchaseOrder->transactionDetails;
foreach ($transactionDetails as $detail) {
$displayUnitPrice = 0;
@@ -160,7 +164,7 @@ class ExportsSalesInvoiceReport implements FromQuery, WithHeadings, WithHeadingR
$records[] = [
$firstItem ? '<<New>>' : '',
$firstItem ? $docNo : '',
$formattedDocumentDate,
$company->debtor,
$invoiceTransaction->bill_no,
app/Classes/Modules/Exports/Services/ExportsSalesInvoiceWithRefundReport.php
+5 -1
View File
@@ -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 :'<<New>>';
$transactionDetails = $purchaseOrder ? $purchaseOrder->transactionDetails : null;
if($transactionDetails){
foreach ($transactionDetails as $detail) {
@@ -169,7 +173,7 @@ class ExportsSalesInvoiceWithRefundReport implements FromQuery, WithHeadings, Wi
$records[] = [
$firstItem ? '<<New>>' : '',
$firstItem ? $docNo : '',
$formattedDocumentDate,
$company->debtor,
$invoiceTransaction ? $invoiceTransaction->bill_no : '',