From 2f07a36d76b6d2acce3c2b8303d4b6b4ee6139cc Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 23 Jul 2020 21:30:51 +1000
Subject: [PATCH] Fixes for unique invoice number rule

---
 app/Http/Controllers/BaseController.php                |  2 +-
 .../Invoice/UniqueInvoiceNumberRule.php                | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php
index ac3adf57934d..ad12424f286b 100644
--- a/app/Http/Controllers/BaseController.php
+++ b/app/Http/Controllers/BaseController.php
@@ -148,7 +148,7 @@ class BaseController extends Controller
 
         $query->with(
         [
-        'company' => function ($query) use($updated_at){$query->where('updated_at', '>=', 0);},
+        'company' => function ($query) use($updated_at){$query->whereNotNull('updated_at');},
         'company.clients' =>function ($query) use($updated_at){$query->where('updated_at', '>=', $updated_at);},
         'company.tax_rates'=>function ($query) use($updated_at){$query->where('updated_at', '>=', $updated_at);},
         'company.groups'=>function ($query) use($updated_at){$query->where('updated_at', '>=', $updated_at);},
diff --git a/app/Http/ValidationRules/Invoice/UniqueInvoiceNumberRule.php b/app/Http/ValidationRules/Invoice/UniqueInvoiceNumberRule.php
index ca2d604f75ee..c3997f9ff3b8 100644
--- a/app/Http/ValidationRules/Invoice/UniqueInvoiceNumberRule.php
+++ b/app/Http/ValidationRules/Invoice/UniqueInvoiceNumberRule.php
@@ -54,13 +54,17 @@ class UniqueInvoiceNumberRule implements Rule
      * 
      * @return bool
      */
-    private function checkIfInvoiceNumberUnique($value) : bool
+    private function checkIfInvoiceNumberUnique() : bool
     {
 
-        return Invoice::where('client_id', $this->input['client_id'])
+        $invoice = Invoice::where('client_id', $this->input['client_id'])
                         ->where('number', $this->input['number'])
                         ->withTrashed()
-                        ->exists();
+                        ->first();
 
+        if($invoice)
+            return false;
+
+        return true;
     }
 }