Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-08 05:54:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6281 from turbo124/v5-develop

Browse Source 
Fixes for checking constraints
This commit is contained in:
David Bomba 2021-07-16 16:55:26 +10:00 committed by GitHub
commit e1e1787d08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Jobs/Util/Import.php
View File

@ -561,6 +561,7 @@ class Import implements ShouldQueue
$model_query = (new $model()) $model_query = (new $model())
->query() ->query()
->where($column, $value) ->where($column, $value)
->where('company_id', $this->company->id)
->exists(); ->exists();
if($model_query) if($model_query)

1
app/Repositories/ClientRepository.php
View File

@ -63,6 +63,7 @@ class ClientRepository extends BaseRepository
} }
$client->fill($data); $client->fill($data);
$client->save();
if (!isset($client->number) || empty($client->number)) { if (!isset($client->number) || empty($client->number)) {
$client->number = $this->getNextClientNumber($client); $client->number = $this->getNextClientNumber($client);