From c59cec3f40b2bd97d7c39acc43d013eeb59fa95c Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Tue, 26 Aug 2025 13:30:28 +0800
Subject: [PATCH] E-Invoice - Automapping Issues, Credit Note Report (Import)
 Partial Completion

---
 .../ControllersLogic/ImportExcelLogic.php     | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Imports/ControllersLogic/ImportExcelLogic.php b/app/Classes/Modules/Imports/ControllersLogic/ImportExcelLogic.php
index db810cb9..f8813f4c 100644
--- a/app/Classes/Modules/Imports/ControllersLogic/ImportExcelLogic.php
+++ b/app/Classes/Modules/Imports/ControllersLogic/ImportExcelLogic.php
@@ -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);