From a2d954b7063fd6a46f00f77457e546a93e309476 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 1 Jul 2021 13:34:57 +1000
Subject: [PATCH] Fixes for custom values

---
 app/Jobs/Ninja/CompanySizeCheck.php         |  2 +-
 app/Jobs/Util/Import.php                    |  4 ++++
 app/Repositories/CompanyRepository.php      | 19 +++++++++++++++++++
 app/Repositories/GroupSettingRepository.php |  4 +---
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/app/Jobs/Ninja/CompanySizeCheck.php b/app/Jobs/Ninja/CompanySizeCheck.php
index ff55abb16bb6..ea1dd2efaa84 100644
--- a/app/Jobs/Ninja/CompanySizeCheck.php
+++ b/app/Jobs/Ninja/CompanySizeCheck.php
@@ -56,7 +56,7 @@ class CompanySizeCheck implements ShouldQueue
     {
         Company::cursor()->each(function ($company) {
 
-            if ($company->invoices()->count() > 1000 || $company->products()->count() > 1000 || $company->clients()->count() > 1000) {
+            if ($company->invoices()->count() > 500 || $company->products()->count() > 500 || $company->clients()->count() > 500) {
                 
                 nlog("Marking company {$company->id} as large");
 
diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php
index 71d54ea1a3db..f629806aecac 100644
--- a/app/Jobs/Util/Import.php
+++ b/app/Jobs/Util/Import.php
@@ -393,6 +393,10 @@ class Import implements ShouldQueue
             foreach ($data['settings'] as $key => $value) {
                 if ($key == 'invoice_design_id' || $key == 'quote_design_id' || $key == 'credit_design_id') {
                     $value = $this->encodePrimaryKey($value);
+
+                    if(!$value)
+                        $value = $this->encodePrimaryKey(1);
+                    
                 }
 
                 if ($key == 'payment_terms' && $key = '') {
diff --git a/app/Repositories/CompanyRepository.php b/app/Repositories/CompanyRepository.php
index e1a919bca52b..9e56843de497 100644
--- a/app/Repositories/CompanyRepository.php
+++ b/app/Repositories/CompanyRepository.php
@@ -48,6 +48,25 @@ class CompanyRepository extends BaseRepository
 
     private function parseCustomFields($fields) :array
     {
+        
+        if(array_key_exists('account1', $fields))
+            $fields['company1'] = $fields['account1'];
+
+        if(array_key_exists('company2', $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;
         }
diff --git a/app/Repositories/GroupSettingRepository.php b/app/Repositories/GroupSettingRepository.php
index fdd5bb5e0d33..cbb72b343d89 100644
--- a/app/Repositories/GroupSettingRepository.php
+++ b/app/Repositories/GroupSettingRepository.php
@@ -29,9 +29,7 @@ class GroupSettingRepository extends BaseRepository
             $group_setting->save();
         }
 
-        nlog($data['settings']);
-
-        if(count((array)$data['settings']) == 0){
+        if(!array_key_exists('settings', $data) || count((array)$data['settings']) == 0){
             $settings = new \stdClass;
             $settings->entity = Client::class;
             $group_setting->settings = $settings;