From a963396fef0d6f119bc75222a40ba7b135fec0f1 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 8 Jul 2021 20:22:06 +1000
Subject: [PATCH] Minor FIxes

---
 app/Jobs/Util/Import.php               | 32 ++++++++++++++++++++++++++
 app/Repositories/CompanyRepository.php | 19 +--------------
 2 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php
index d29cba74482e..cf7672174e5b 100644
--- a/app/Jobs/Util/Import.php
+++ b/app/Jobs/Util/Import.php
@@ -367,6 +367,10 @@ class Import implements ShouldQueue
             unset($data['referral_code']);
         }
 
+        if (isset($data['custom_fields']) && is_array($data['custom_fields'])) {
+            $data['custom_fields'] = $this->parseCustomFields($data['custom_fields']);
+        }
+
         $company_repository = new CompanyRepository();
         $company_repository->save($data, $this->company);
 
@@ -388,6 +392,34 @@ class Import implements ShouldQueue
         $company_repository = null;
     }
 
+    private function parseCustomFields($fields) :array
+    {
+        
+        if(array_key_exists('account1', $fields))
+            $fields['company1'] = $fields['account1'];
+
+        if(array_key_exists('account2', $fields))
+            $fields['company2'] = $fields['account2'];
+
+        if(array_key_exists('invoice1', $fields))
+            $fields['surcharge1'] = $fields['invoice1'];
+
+        if(array_key_exists('invoice2', $fields))
+            $fields['surcharge2'] = $fields['invoice2'];
+
+        if(array_key_exists('invoice_text1', $fields))
+            $fields['invoice1'] = $fields['invoice_text1'];
+
+        if(array_key_exists('invoice_text2', $fields))
+            $fields['invoice2'] = $fields['invoice_text2'];
+
+        foreach ($fields as &$value) {
+            $value = (string) $value;
+        }
+
+        return $fields;
+    }
+
     private function transformCompanyData(array $data): array
     {
         $company_settings = CompanySettings::defaults();
diff --git a/app/Repositories/CompanyRepository.php b/app/Repositories/CompanyRepository.php
index 7b15efad621f..2b4b53c75bf6 100644
--- a/app/Repositories/CompanyRepository.php
+++ b/app/Repositories/CompanyRepository.php
@@ -49,28 +49,11 @@ class CompanyRepository extends BaseRepository
     private function parseCustomFields($fields) :array
     {
         
-        if(array_key_exists('account1', $fields))
-            $fields['company1'] = $fields['account1'];
-
-        if(array_key_exists('account2', $fields))
-            $fields['company2'] = $fields['account2'];
-
-        if(array_key_exists('invoice1', $fields))
-            $fields['surcharge1'] = $fields['invoice1'];
-
-        if(array_key_exists('invoice2', $fields))
-            $fields['surcharge2'] = $fields['invoice2'];
-
-        if(array_key_exists('invoice_text1', $fields))
-            $fields['invoice1'] = $fields['invoice_text1'];
-
-        if(array_key_exists('invoice_text2', $fields))
-            $fields['invoice2'] = $fields['invoice_text2'];
-
         foreach ($fields as &$value) {
             $value = (string) $value;
         }
 
         return $fields;
     }
+
 }