From 34b02ee8bf5cbdaa72bf596f8aa9112506e10aed Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 19 Jun 2018 22:46:35 +0300 Subject: [PATCH] Changes to support the mobile app --- app/Console/Commands/stubs/repository.stub | 2 +- app/Models/Client.php | 2 +- app/Models/Vendor.php | 2 +- app/Ninja/Repositories/ClientRepository.php | 4 ++-- app/Ninja/Repositories/ContactRepository.php | 2 +- app/Ninja/Repositories/InvoiceRepository.php | 2 +- app/Ninja/Repositories/VendorContactRepository.php | 2 +- app/Ninja/Repositories/VendorRepository.php | 2 +- app/Services/InvoiceService.php | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/Console/Commands/stubs/repository.stub b/app/Console/Commands/stubs/repository.stub index 208172251ecf..ce5c786eb8fc 100644 --- a/app/Console/Commands/stubs/repository.stub +++ b/app/Console/Commands/stubs/repository.stub @@ -58,7 +58,7 @@ class $STUDLY_NAME$Repository extends BaseRepository $entity->save(); /* - if (!$publicId || $publicId == '-1') { + if (!$publicId || intval($publicId) < 0) { event(new ClientWasCreated($client)); } else { event(new ClientWasUpdated($client)); diff --git a/app/Models/Client.php b/app/Models/Client.php index d50372dde1bb..e39bcd4f21b7 100644 --- a/app/Models/Client.php +++ b/app/Models/Client.php @@ -264,7 +264,7 @@ class Client extends EntityModel // check if this client wasRecentlyCreated to ensure a new contact is // always created even if the request includes a contact id - if (! $this->wasRecentlyCreated && $publicId && $publicId != '-1') { + if (! $this->wasRecentlyCreated && $publicId && intval($publicId) > 0) { $contact = Contact::scope($publicId)->whereClientId($this->id)->firstOrFail(); } else { $contact = Contact::createNew(); diff --git a/app/Models/Vendor.php b/app/Models/Vendor.php index a3cd62178243..c1843c511591 100644 --- a/app/Models/Vendor.php +++ b/app/Models/Vendor.php @@ -219,7 +219,7 @@ class Vendor extends EntityModel { $publicId = isset($data['public_id']) ? $data['public_id'] : (isset($data['id']) ? $data['id'] : false); - if (! $this->wasRecentlyCreated && $publicId && $publicId != '-1') { + if (! $this->wasRecentlyCreated && $publicId && intval($publicId) > 0) { $contact = VendorContact::scope($publicId)->whereVendorId($this->id)->firstOrFail(); } else { $contact = VendorContact::createNew(); diff --git a/app/Ninja/Repositories/ClientRepository.php b/app/Ninja/Repositories/ClientRepository.php index a1e3d89ca2dd..10d8de1421a8 100644 --- a/app/Ninja/Repositories/ClientRepository.php +++ b/app/Ninja/Repositories/ClientRepository.php @@ -87,7 +87,7 @@ class ClientRepository extends BaseRepository if ($client) { // do nothing - } elseif (! $publicId || $publicId == '-1') { + } elseif (! $publicId || intval($publicId) < 0) { $client = Client::createNew(); } else { $client = Client::scope($publicId)->with('contacts')->firstOrFail(); @@ -176,7 +176,7 @@ class ClientRepository extends BaseRepository } } - if (! $publicId || $publicId == '-1') { + if (! $publicId || intval($publicId) < 0) { event(new ClientWasCreated($client)); } else { event(new ClientWasUpdated($client)); diff --git a/app/Ninja/Repositories/ContactRepository.php b/app/Ninja/Repositories/ContactRepository.php index 992712cfa22b..14c97e43e867 100644 --- a/app/Ninja/Repositories/ContactRepository.php +++ b/app/Ninja/Repositories/ContactRepository.php @@ -19,7 +19,7 @@ class ContactRepository extends BaseRepository if ($contact) { // do nothing - } elseif (! $publicId || $publicId == '-1') { + } elseif (! $publicId || intval($publicId) < 0) { $contact = Contact::createNew(); $contact->send_invoice = true; $contact->client_id = $data['client_id']; diff --git a/app/Ninja/Repositories/InvoiceRepository.php b/app/Ninja/Repositories/InvoiceRepository.php index 92b26cd4b626..6972b2880faa 100644 --- a/app/Ninja/Repositories/InvoiceRepository.php +++ b/app/Ninja/Repositories/InvoiceRepository.php @@ -381,7 +381,7 @@ class InvoiceRepository extends BaseRepository @file_put_contents(storage_path('logs/invoice-repo.log'), $logMessage, FILE_APPEND); } - $isNew = ! $publicId || $publicId == '-1'; + $isNew = ! $publicId || inval($publicId) < 0; if ($invoice) { // do nothing diff --git a/app/Ninja/Repositories/VendorContactRepository.php b/app/Ninja/Repositories/VendorContactRepository.php index a4775637d8e0..5955f86f4f90 100644 --- a/app/Ninja/Repositories/VendorContactRepository.php +++ b/app/Ninja/Repositories/VendorContactRepository.php @@ -12,7 +12,7 @@ class VendorContactRepository extends BaseRepository { $publicId = isset($data['public_id']) ? $data['public_id'] : false; - if (! $publicId || $publicId == '-1') { + if (! $publicId || intval($publicId) < 0) { $contact = VendorContact::createNew(); //$contact->send_invoice = true; $contact->vendor_id = $data['vendor_id']; diff --git a/app/Ninja/Repositories/VendorRepository.php b/app/Ninja/Repositories/VendorRepository.php index fe44f61ea0ff..e44a8154e522 100644 --- a/app/Ninja/Repositories/VendorRepository.php +++ b/app/Ninja/Repositories/VendorRepository.php @@ -68,7 +68,7 @@ class VendorRepository extends BaseRepository if ($vendor) { // do nothing - } elseif (! $publicId || $publicId == '-1') { + } elseif (! $publicId || intval($publicId) < 0) { $vendor = Vendor::createNew(); } else { $vendor = Vendor::scope($publicId)->with('vendor_contacts')->firstOrFail(); diff --git a/app/Services/InvoiceService.php b/app/Services/InvoiceService.php index 12ce230bb0c6..04af216b3416 100644 --- a/app/Services/InvoiceService.php +++ b/app/Services/InvoiceService.php @@ -84,7 +84,7 @@ class InvoiceService extends BaseService $canSaveClient = false; $canViewClient = false; $clientPublicId = array_get($data, 'client.public_id') ?: array_get($data, 'client.id'); - if (empty($clientPublicId) || $clientPublicId == '-1') { + if (empty($clientPublicId) || intval($clientPublicId) < 0) { $canSaveClient = Auth::user()->can('create', ENTITY_CLIENT); } else { $client = Client::scope($clientPublicId)->first();