From 36ed332e5f2ec150282455456ea62d7e43a13461 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Fri, 8 Aug 2025 21:40:02 +0800
Subject: [PATCH] E-Invoice - Minor syntax update, sync code from Shipping
 Portal

---
 app/Classes/General/Helper.php                |  4 +--
 .../Exports/Services/ExportsCompanies.php     | 32 +++++++++----------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/Classes/General/Helper.php b/app/Classes/General/Helper.php
index 89bc70b2..8b5061ec 100644
--- a/app/Classes/General/Helper.php
+++ b/app/Classes/General/Helper.php
@@ -87,7 +87,7 @@ class Helper
         return strtoupper('ringgit ' . $ringgitWords . ' and ' . $centsWords . ' cents only');
     }
 
-    public static function getStateCodeByName($name)
+    public static function getLHDNStateCodeByName($name)
     {
         $path = resource_path('data/lhdn/StateCodes.json');
 
@@ -127,7 +127,7 @@ class Helper
         return null;
     }
 
-    public static function getMsicDescriptionByCode($code)
+    public static function getLHDNMsicDescriptionByCode($code)
     {
         $path = resource_path('data/lhdn/MSICSubCategoryCodes.json');
 
diff --git a/app/Classes/Modules/Exports/Services/ExportsCompanies.php b/app/Classes/Modules/Exports/Services/ExportsCompanies.php
index 3f97e7a0..06bfc289 100644
--- a/app/Classes/Modules/Exports/Services/ExportsCompanies.php
+++ b/app/Classes/Modules/Exports/Services/ExportsCompanies.php
@@ -81,22 +81,22 @@ class ExportsCompanies implements FromQuery, WithHeadings, WithHeadingRow, WithM
         }
 
         return [
-            $company->tin, // 'TIN',
-            $identityReference, // 'IdentityNo',
-            $company->name, // 'Name',
-            $identityType === DocumentType::IDENTITY_CARD ? 'MyKAD' : '', // 'IdentityType',
-            $company->type !== null ? (string) $company->type : '0', // 'TaxClassification',
-            $company->msic_code, // 'MSICCode',
-            $company->msic_code ? Helper::getMsicDescriptionByCode($company->msic_code) : '', // 'BusinessActivityDesc',
-            $company->debtor, // 'DebtorCode',
-            $company->name, // 'TradeName',
-            $address ? $address->street_one . ',' . $address->street_two : '',// 'Address',
-            $address ? $address->postcode : '', // 'PostCode',
-            $company->contacts()->first() ? $company->contacts()->first()->phone : '', // 'Phone',
-            $employee ? $employee->email : '', // 'EmailAddress',
-            $address ? $address->district()->first()->name : '', // 'City',
-            'MYS', // 'CountryCode',
-            $address ? Helper::getStateCodeByName($address->state()->first()->name) : '',  // 'StateCode'
+            $company->tin,                                                                          // 'TIN',
+            $identityReference,                                                                     // 'IdentityNo',
+            $company->name,                                                                         // 'Name',
+            $identityType === DocumentType::IDENTITY_CARD ? 'MyKAD' : '',                           // 'IdentityType',
+            $company->type !== null ? (string) $company->type : '0',                                // 'TaxClassification',
+            $company->msic_code,                                                                    // 'MSICCode',
+            $company->msic_code ? Helper::getLHDNMsicDescriptionByCode($company->msic_code) : '',   // 'BusinessActivityDesc',
+            $company->debtor,                                                                       // 'DebtorCode',
+            $company->name,                                                                         // 'TradeName',
+            $address ? $address->street_one . ',' . $address->street_two : '',                      // 'Address',
+            $address ? $address->postcode : '',                                                     // 'PostCode',
+            $company->contacts()->first() ? $company->contacts()->first()->phone : '',              // 'Phone',
+            $employee ? $employee->email : '',                                                      // 'EmailAddress',
+            $address ? $address->district()->first()->name : '',                                    // 'City',
+            'MYS',                                                                                  // 'CountryCode',
+            $address ? Helper::getLHDNStateCodeByName($address->state()->first()->name) : '',       // 'StateCode'
         ];
     }
 }