From 3be7b8975aced02a212a04ec62f8e75d9056a10b Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 21 Aug 2021 19:53:20 +1000 Subject: [PATCH] Minor fixes for import --- VERSION.txt | 2 +- app/Jobs/Util/Import.php | 1 + config/ninja.php | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index 1c26b6f22f62..e230c8396d19 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.2.19 \ No newline at end of file +5.3.0 \ No newline at end of file diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php index c452fe900ae1..664c09afa9b1 100644 --- a/app/Jobs/Util/Import.php +++ b/app/Jobs/Util/Import.php @@ -712,6 +712,7 @@ class Import implements ShouldQueue $modified = $resource; $modified['company_id'] = $this->company->id; $modified['user_id'] = $this->processUserId($resource); + $modified['number'] = $this->checkUniqueConstraint(Vendor::class, 'number', $modified['number']); unset($modified['id']); unset($modified['contacts']); diff --git a/config/ninja.php b/config/ninja.php index 3533b1a7b2f7..e893d61c3b11 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.2.19', - 'app_tag' => '5.2.19', + 'app_version' => '5.3.0', + 'app_tag' => '5.3.0', 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', ''),