From b0835ed361ea5b41fc03b750d6d5e1afabf043f7 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 3 May 2021 20:50:08 +1000
Subject: [PATCH] 5.1.59

---
 VERSION.txt                                | 2 +-
 app/Jobs/Product/UpdateOrCreateProduct.php | 5 ++++-
 app/Jobs/Util/Import.php                   | 4 ++--
 app/Jobs/Util/SystemLogger.php             | 3 +++
 config/ninja.php                           | 4 ++--
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/VERSION.txt b/VERSION.txt
index 41a7f494e3c6..30aaaeaa47a6 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.1.58
\ No newline at end of file
+5.1.59
\ No newline at end of file
diff --git a/app/Jobs/Product/UpdateOrCreateProduct.php b/app/Jobs/Product/UpdateOrCreateProduct.php
index b5149e6b84cd..ff1e0d0e56e3 100644
--- a/app/Jobs/Product/UpdateOrCreateProduct.php
+++ b/app/Jobs/Product/UpdateOrCreateProduct.php
@@ -85,7 +85,10 @@ class UpdateOrCreateProduct implements ShouldQueue
             $product->notes = isset($item->notes) ? $item->notes : '';
             //$product->cost = isset($item->cost) ? $item->cost : 0; //this value shouldn't be updated.
             $product->price = isset($item->cost) ? $item->cost : 0;
-            $product->quantity = isset($item->quantity) ? $item->quantity : 0;
+            
+            if(!$product->id)
+                $product->quantity = isset($item->quantity) ? $item->quantity : 0;
+            
             $product->tax_name1 = isset($item->tax_name1) ? $item->tax_name1 : '';
             $product->tax_rate1 = isset($item->tax_rate1) ? $item->tax_rate1 : 0;
             $product->tax_name2 = isset($item->tax_name2) ? $item->tax_name2 : '';
diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php
index badcb00970e1..d39e2a554680 100644
--- a/app/Jobs/Util/Import.php
+++ b/app/Jobs/Util/Import.php
@@ -226,8 +226,8 @@ class Import implements ShouldQueue
         
             //company size check
             if ($this->company->invoices()->count() > 1000 || $this->company->products()->count() > 1000 || $this->company->clients()->count() > 1000) {
-                $company->is_large = true;
-                $company->save();
+                $this->company->is_large = true;
+                $this->company->save();
             }
 
         info('Completed🚀🚀🚀🚀🚀 at '.now());
diff --git a/app/Jobs/Util/SystemLogger.php b/app/Jobs/Util/SystemLogger.php
index 74e467b023fe..1e71d8f6f591 100644
--- a/app/Jobs/Util/SystemLogger.php
+++ b/app/Jobs/Util/SystemLogger.php
@@ -54,6 +54,9 @@ class SystemLogger implements ShouldQueue
             'type_id' => $this->type_id,
         ];
 
+        if(!$this->log)
+            return;
+
         SystemLog::create($sl);
     }
 }
diff --git a/config/ninja.php b/config/ninja.php
index c5a12bcfefd3..34e346da0a9d 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.1.58',
-    'app_tag' => '5.1.58-release',
+    'app_version' => '5.1.59',
+    'app_tag' => '5.1.59-release',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', false),