diff --git a/app/Classes/Modules/Exports/Services/ExportsSalesInvoiceWithRefundReport.php b/app/Classes/Modules/Exports/Services/ExportsSalesInvoiceWithRefundReport.php index 86fe3f0b..3905355e 100644 --- a/app/Classes/Modules/Exports/Services/ExportsSalesInvoiceWithRefundReport.php +++ b/app/Classes/Modules/Exports/Services/ExportsSalesInvoiceWithRefundReport.php @@ -43,8 +43,8 @@ class ExportsSalesInvoiceWithRefundReport implements FromQuery, WithHeadings, Wi 'DeptNo', 'Qty', 'UnitPrice', - 'submiteinvoice', - 'ConsolidatedEinvoice', + 'SubmitEinvoice', + 'ConsolidatedEInvoice', ]; } @@ -162,7 +162,7 @@ class ExportsSalesInvoiceWithRefundReport implements FromQuery, WithHeadings, Wi $detail->quantity, $displayUnitPrice ? number_format($displayUnitPrice, 2): 0, $firstItem ? 'T' : '', - $company->e_invoice ? 'F' : 'T' + $firstItem ? ($company->e_invoice ? 'F' : 'T') : '' ]; if($firstItem) { @@ -199,7 +199,7 @@ class ExportsSalesInvoiceWithRefundReport implements FromQuery, WithHeadings, Wi '1', $serviceCharge ? number_format($serviceCharge, 2): '0', '', - $company->e_invoice ? 'F' : 'T' + '' ]; // Service Charge - Ends @@ -246,7 +246,7 @@ class ExportsSalesInvoiceWithRefundReport implements FromQuery, WithHeadings, Wi '1', $adjustment ? number_format($adjustment, 2): '0', '', - $company->e_invoice ? 'F' : 'T' + '' ]; } // Adjustment - Ends