From 52d21729535bb14a0bb148950f899cfe74c425eb Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 16 Jul 2021 08:51:01 +1000 Subject: [PATCH 1/2] Fixes for checking constraints --- app/Jobs/Util/Import.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php index 99856931a0e5..adf0f12fc4b7 100644 --- a/app/Jobs/Util/Import.php +++ b/app/Jobs/Util/Import.php @@ -561,6 +561,7 @@ class Import implements ShouldQueue $model_query = (new $model()) ->query() ->where($column, $value) + ->where('company_id', $this->company->id) ->exists(); if($model_query) From 673f188100f572aff5c984c3e8804e964fded7d8 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 16 Jul 2021 15:40:38 +1000 Subject: [PATCH 2/2] Ensure the client is saved prior to getting a number back --- app/Repositories/ClientRepository.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Repositories/ClientRepository.php b/app/Repositories/ClientRepository.php index 7dd720c0fd00..8dda9f5c692e 100644 --- a/app/Repositories/ClientRepository.php +++ b/app/Repositories/ClientRepository.php @@ -63,7 +63,8 @@ class ClientRepository extends BaseRepository } $client->fill($data); - + $client->save(); + if (!isset($client->number) || empty($client->number)) { $client->number = $this->getNextClientNumber($client); }