Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #709 from turbo124/master

Browse Source 
Table locking for public_id integrity
This commit is contained in:
David Bomba 2016-02-10 11:32:30 +11:00
commit 3b1bfe1013
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Models/EntityModel.php
View File

@ -27,6 +27,7 @@ class EntityModel extends Eloquent
$lastEntity = $className::withTrashed()
->scope(false, $entity->account_id)
->orderBy('public_id', 'DESC')
->lockForUpdate()
->first();
if ($lastEntity) {

5
app/Ninja/Repositories/ClientRepository.php
View File

@ -66,6 +66,8 @@ class ClientRepository extends BaseRepository
{
$publicId = isset($data['public_id']) ? $data['public_id'] : false;
DB::beginTransaction();
if (!$publicId || $publicId == '-1') {
$client = Client::createNew();
} else {
@ -75,6 +77,9 @@ class ClientRepository extends BaseRepository
$client->fill($data);
$client->save();
DB::commit();
/*
if ( ! isset($data['contact']) && ! isset($data['contacts'])) {
return $client;