From 6a54bb8c4519e68a685fa6a69d542338b8dcf566 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sat, 31 Oct 2020 16:35:05 +1100
Subject: [PATCH] Fixes for migrations Vendor Contacts

---
 app/Http/Controllers/MigrationController.php | 14 +++++++++++++-
 app/Jobs/Util/Import.php                     |  6 ++++--
 app/Models/VendorContact.php                 |  1 +
 app/Repositories/VendorContactRepository.php |  6 ++----
 app/Repositories/VendorRepository.php        |  2 +-
 5 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/MigrationController.php b/app/Http/Controllers/MigrationController.php
index e86f89fed449..e799b1b4379f 100644
--- a/app/Http/Controllers/MigrationController.php
+++ b/app/Http/Controllers/MigrationController.php
@@ -227,6 +227,8 @@ class MigrationController extends BaseController
 
             $account = auth()->user()->account;
             $company = (new ImportMigrations())->getCompany($account);
+            $company->is_disabled = true;
+            $company->save();
 
             $account->default_company_id = $company->id;
             $account->save();
@@ -288,6 +290,9 @@ class MigrationController extends BaseController
             $account = auth()->user()->account;
             $company = (new ImportMigrations())->getCompany($account);
 
+            $company->is_disabled = true;
+            $company->save();
+            
             $account->default_company_id = $company->id;
             $account->save();
 
@@ -322,7 +327,10 @@ class MigrationController extends BaseController
 
             $account = auth()->user()->account;
             $company = (new ImportMigrations())->getCompany($account);
-
+            
+            $company->is_disabled = true;
+            $company->save();
+            
             $account->default_company_id = $company->id;
             $account->save();
 
@@ -354,6 +362,10 @@ class MigrationController extends BaseController
             $account = auth()->user()->account;
             $company = (new ImportMigrations())->getCompany($account);
 
+            $company->is_disabled = true;
+            $company->save();
+            
+
             $company_token = new CompanyToken();
             $company_token->user_id = $user->id;
             $company_token->company_id = $company->id;
diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php
index 314d4c4b264a..c7e97d07bf05 100644
--- a/app/Jobs/Util/Import.php
+++ b/app/Jobs/Util/Import.php
@@ -490,7 +490,7 @@ class Import implements ShouldQueue
                 foreach ($modified_contacts as $key => $vendor_contacts) {
                     $modified_contacts[$key]['company_id'] = $this->company->id;
                     $modified_contacts[$key]['user_id'] = $this->processUserId($resource);
-                    $modified_contacts[$key]['client_id'] = $vendor->id;
+                    $modified_contacts[$key]['vendor_id'] = $vendor->id;
                     $modified_contacts[$key]['password'] = 'mysuperpassword'; // @todo, and clean up the code..
                     unset($modified_contacts[$key]['id']);
                 }
@@ -1138,7 +1138,9 @@ class Import implements ShouldQueue
 
             if(isset($resource['project_id']))
                 $modified['project_id'] = $this->transformId('projects', $resource['project_id']);
-           // $modified['vendor_id'] = $this->transformId('vendors', $resource['vendor_id']);
+
+            if(isset($resource['vendor_id']))
+                $modified['vendor_id'] = $this->transformId('vendors', $resource['vendor_id']);
 
             $expense = Expense::Create($modified);
 
diff --git a/app/Models/VendorContact.php b/app/Models/VendorContact.php
index 2c50e1538d8c..acbff497cf43 100644
--- a/app/Models/VendorContact.php
+++ b/app/Models/VendorContact.php
@@ -74,6 +74,7 @@ class VendorContact extends Authenticatable implements HasLocalePreference
         'custom_value4',
         'email',
         'is_primary',
+        'vendor_id',
     ];
 
     public function getEntityType()
diff --git a/app/Repositories/VendorContactRepository.php b/app/Repositories/VendorContactRepository.php
index 28596ccb4fb1..3700c59e6034 100644
--- a/app/Repositories/VendorContactRepository.php
+++ b/app/Repositories/VendorContactRepository.php
@@ -23,7 +23,7 @@ class VendorContactRepository extends BaseRepository
 {
     public $is_primary;
 
-    public function save($contacts, Vendor $vendor) : void
+    public function save(array $data, Vendor $vendor) : void
     {
 
         if (isset($data['contacts'])) {
@@ -65,9 +65,7 @@ class VendorContactRepository extends BaseRepository
             $update_contact->fill($contact);
 
             if (array_key_exists('password', $contact) && strlen($contact['password']) > 1) {
-
                 $update_contact->password = Hash::make($contact['password']);
-                
             }
 
             $update_contact->save();
@@ -76,7 +74,7 @@ class VendorContactRepository extends BaseRepository
         $vendor->load('contacts');
 
         //always made sure we have one blank contact to maintain state
-        if ($contacts->count() == 0) {
+        if ($vendor->contacts->count() == 0) {
             $new_contact = new VendorContact;
             $new_contact->vendor_id = $vendor->id;
             $new_contact->company_id = $vendor->company_id;
diff --git a/app/Repositories/VendorRepository.php b/app/Repositories/VendorRepository.php
index 916f3504645d..165478c7e5ff 100644
--- a/app/Repositories/VendorRepository.php
+++ b/app/Repositories/VendorRepository.php
@@ -70,7 +70,7 @@ class VendorRepository extends BaseRepository
         $vendor->save();
 
         if (isset($data['contacts'])) {
-            $contacts = $this->contact_repo->save($data['contacts'], $vendor);
+            $contacts = $this->contact_repo->save($data, $vendor);
         }
 
         if (empty($data['name'])) {