From 47916ed30a498bd9baa468ce820896bae60fd258 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 4 Nov 2022 15:07:37 +1100
Subject: [PATCH] Improve handling of saving a client that has been created
 from an invoice import

---
 app/Import/Transformer/Csv/ClientTransformer.php |  3 ++-
 app/Repositories/ClientRepository.php            | 10 +++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/Import/Transformer/Csv/ClientTransformer.php b/app/Import/Transformer/Csv/ClientTransformer.php
index f2ea9ec87..a2c4721bb 100644
--- a/app/Import/Transformer/Csv/ClientTransformer.php
+++ b/app/Import/Transformer/Csv/ClientTransformer.php
@@ -11,6 +11,7 @@
 
 namespace App\Import\Transformer\Csv;
 
+use App\DataMapper\ClientSettings;
 use App\Import\ImportException;
 use App\Import\Transformer\BaseTransformer;
 use Illuminate\Support\Str;
@@ -31,7 +32,7 @@ class ClientTransformer extends BaseTransformer
             throw new ImportException('Client already exists');
         }
 
-        $settings = new \stdClass();
+        $settings = ClientSettings::defaults();
         $settings->currency_id = (string) $this->getCurrencyByCode($data);
 
         return [
diff --git a/app/Repositories/ClientRepository.php b/app/Repositories/ClientRepository.php
index af2cf8107..23c6ae8ce 100644
--- a/app/Repositories/ClientRepository.php
+++ b/app/Repositories/ClientRepository.php
@@ -75,7 +75,15 @@ class ClientRepository extends BaseRepository
             $client->country_id = $company->settings->country_id;
         }
 
-        $client->save();
+        try{
+            $client->save();
+        }
+        catch(\Exception $e) {
+
+            nlog("client save failed");
+            nlog($data);
+            
+        }
 
         if (! isset($client->number) || empty($client->number) || strlen($client->number) == 0) {
             // $client->number = $this->getNextClientNumber($client);