From 3379952ec2e20cb242ce099df3f2f351dfbedf2d Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Fri, 25 Jul 2025 12:40:57 +0800 Subject: [PATCH] E-Invoice - Project 27: Import Tax Entity, Customers Data Report --- app/Classes/Modules/Exports/Services/ExportsCompanies.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsCompanies.php b/app/Classes/Modules/Exports/Services/ExportsCompanies.php index 1ad2613d..3f97e7a0 100644 --- a/app/Classes/Modules/Exports/Services/ExportsCompanies.php +++ b/app/Classes/Modules/Exports/Services/ExportsCompanies.php @@ -71,6 +71,10 @@ class ExportsCompanies implements FromQuery, WithHeadings, WithHeadingRow, WithM $identityNo = $company->documents->where('document_type', DocumentType::SSM_REGISTRATION)->first(); $identityType = DocumentType::SSM_REGISTRATION; } + $identityReference = ""; + if($identityNo){ + $identityReference = preg_replace('/\s*\(.*?\)/', '', $identityNo->reference); + } $address = $company->addresses()->where('e_invoice', '=', true)->latest()->first(); if(!$address){ $address = $company->addresses()->where('billing', '=', true)->first(); @@ -78,7 +82,7 @@ class ExportsCompanies implements FromQuery, WithHeadings, WithHeadingRow, WithM return [ $company->tin, // 'TIN', - $identityNo ? $identityNo->reference: '', // 'IdentityNo', + $identityReference, // 'IdentityNo', $company->name, // 'Name', $identityType === DocumentType::IDENTITY_CARD ? 'MyKAD' : '', // 'IdentityType', $company->type !== null ? (string) $company->type : '0', // 'TaxClassification',