From 43718dc139cdce238ffb87ed9226af40f9429977 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 1 Sep 2022 19:59:25 +1000
Subject: [PATCH] Fixes for transforming vendor contacts

---
 VERSION.txt                                | 2 +-
 app/Http/Requests/Request.php              | 7 ++++++-
 app/Import/Transformer/BaseTransformer.php | 2 +-
 config/ninja.php                           | 4 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/VERSION.txt b/VERSION.txt
index 188886e1989d..f810c24459ff 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.5.17
\ No newline at end of file
+5.5.18
\ No newline at end of file
diff --git a/app/Http/Requests/Request.php b/app/Http/Requests/Request.php
index 601a7a621a8b..b9fcf766e29d 100644
--- a/app/Http/Requests/Request.php
+++ b/app/Http/Requests/Request.php
@@ -139,9 +139,14 @@ class Request extends FormRequest
                     $input['invitations'][$key]['id'] = $this->decodePrimaryKey($input['invitations'][$key]['id']);
                 }
 
-                if (is_string($input['invitations'][$key]['client_contact_id'])) {
+                if (array_key_exists('client_contact_id', $input['invitations'][$key]) && is_string($input['invitations'][$key]['client_contact_id'])) {
                     $input['invitations'][$key]['client_contact_id'] = $this->decodePrimaryKey($input['invitations'][$key]['client_contact_id']);
                 }
+
+                if (array_key_exists('vendor_contact_id', $input['invitations'][$key]) && is_string($input['invitations'][$key]['vendor_contact_id'])) {
+                    $input['invitations'][$key]['vendor_contact_id'] = $this->decodePrimaryKey($input['invitations'][$key]['vendor_contact_id']);
+                }
+
             }
         }
 
diff --git a/app/Import/Transformer/BaseTransformer.php b/app/Import/Transformer/BaseTransformer.php
index 7a7c27ad1310..211a6b52e619 100644
--- a/app/Import/Transformer/BaseTransformer.php
+++ b/app/Import/Transformer/BaseTransformer.php
@@ -129,7 +129,7 @@ class BaseTransformer
      */
     public function hasVendor($name)
     {
-        return Vendor::where('company_id', $this->company)
+        return Vendor::where('company_id', $this->company->id)
             ->where('is_deleted', false)
             ->whereRaw("LOWER(REPLACE(`name`, ' ' ,''))  = ?", [
                 strtolower(str_replace(' ', '', $name)),
diff --git a/config/ninja.php b/config/ninja.php
index 2bc06c3f7dd5..299e67c66820 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -14,8 +14,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => '5.5.17',
-    'app_tag' => '5.5.17',
+    'app_version' => '5.5.18',
+    'app_tag' => '5.5.18',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),