From 0f70579b7268333cfa1bf55f2f9a9d603d43a570 Mon Sep 17 00:00:00 2001
From: = <turbo124@gmail.com>
Date: Sat, 2 Jan 2021 09:32:58 +1100
Subject: [PATCH] Fixes for client_id_number placeholder for generatescounter

---
 app/Utils/Traits/GeneratesCounter.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/Utils/Traits/GeneratesCounter.php b/app/Utils/Traits/GeneratesCounter.php
index b756eba1d416..2814d94f407d 100644
--- a/app/Utils/Traits/GeneratesCounter.php
+++ b/app/Utils/Traits/GeneratesCounter.php
@@ -628,21 +628,24 @@ trait GeneratesCounter
             $replace[] = $entity->id_number;
         }
         
-        if ($entity->client) {
+        if ($entity->client || ($entity instanceof Client)) {
+
+            $client = $entity->client ?: $entity;
+
             $search[] = '{$client_custom1}';
-            $replace[] = $entity->client->custom_value1;
+            $replace[] = $client->custom_value1;
 
             $search[] = '{$client_custom2}';
-            $replace[] = $entity->client->custom_value2;
+            $replace[] = $client->custom_value2;
 
             $search[] = '{$client_custom3}';
-            $replace[] = $entity->client->custom_value3;
+            $replace[] = $client->custom_value3;
 
             $search[] = '{$client_custom4}';
-            $replace[] = $entity->client->custom_value4;
+            $replace[] = $client->custom_value4;
 
             $search[] = '{$client_id_number}';
-            $replace[] = $entity->client->id_number;
+            $replace[] = $client->id_number;
         }
 
         return str_replace($search, $replace, $pattern);