From cf5ddfad81921e48d42e4e8597225890e2bf6d80 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 4 Jul 2021 07:48:16 +1000
Subject: [PATCH] Fixes for credit query

---
 app/Services/Client/ClientService.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Services/Client/ClientService.php b/app/Services/Client/ClientService.php
index a1cf2b316e2a..a7f1021bb377 100644
--- a/app/Services/Client/ClientService.php
+++ b/app/Services/Client/ClientService.php
@@ -51,8 +51,10 @@ class ClientService
         $credits = $this->client->credits()
                       ->where('is_deleted', false)
                       ->where('balance', '>', 0)
-                      ->whereDate('due_date', '<=', now()->format('Y-m-d'))
-                      ->orWhere('due_date', NULL)
+                      ->where(function ($query){
+                            $query->whereDate('due_date', '<=', now()->format('Y-m-d'))
+                                  ->orWhereNull('due_date');
+                      })
                       ->orderBy('created_at','ASC');
 
         return Number::roundValue($credits->sum('balance'), $this->client->currency()->precision);