cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-28 08:53:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dillon/90-e-invoice-f-2' into vapor/development

Browse Source
This commit is contained in:
Dillon Ngo
2025-08-26 13:31:26 +08:00
parent 0d0edb1c18 c59cec3f40
commit dda17187d0
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Imports/ControllersLogic/ImportExcelLogic.php
+23 -1
View File
@@ -95,6 +95,24 @@ class ImportExcelLogic extends AbstractControllerLogic
'knockoffdocno'
];
$creditNoteReportHeader = [
'docno',
'docdate',
'debtorcode',
'ref',
'description',
'reason',
'deptno',
'qty',
'unitprice',
'accno',
'submiteinvoice',
'einvoiceissuedatetime',
'consolidatedeinvoice',
'einvoicevalidationlink'
];
if ($reportType === 'Sales Invoice Report') {
$optionalColumn = 'einvoicevalidationlink';
@@ -105,12 +123,16 @@ class ImportExcelLogic extends AbstractControllerLogic
throw new MalformedRequestException('Uploaded Excel file format is incorrect. Column headers do not match expected format.');
}
} elseif ($reportType === 'Customers Report' && $normalizedHeader !== $customersReportHeader) {
}
elseif ($reportType === 'Customers Report' && $normalizedHeader !== $customersReportHeader) {
throw new MalformedRequestException('Uploaded Excel file format is incorrect. Column headers do not match expected format.');
}
elseif ($reportType === '01R - RECEIVE PAYMENT (FULL PAYMENT) [AR RECEIVE PAYMENT]' && $normalizedHeader !== $paymentReportHeader) {
throw new MalformedRequestException('Uploaded Excel file format is incorrect. Column headers do not match expected format.');
}
elseif ($reportType === 'Credit Note Report' && $normalizedHeader !== $creditNoteReportHeader) {
throw new MalformedRequestException('Uploaded Excel file format is incorrect. Column headers do not match expected format.');
}
if ($reportType === 'Sales Invoice Report') {
$this->processSalesInvoiceReport($sheet);