From d26d26fccf75889057aaa3fa6d593d493fc94898 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 10 Jan 2021 21:45:02 +1100
Subject: [PATCH] Fixes for client counteR

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

diff --git a/app/Utils/Traits/GeneratesCounter.php b/app/Utils/Traits/GeneratesCounter.php
index 8a7bec7af7b1..80fecb8b8418 100644
--- a/app/Utils/Traits/GeneratesCounter.php
+++ b/app/Utils/Traits/GeneratesCounter.php
@@ -49,7 +49,7 @@ trait GeneratesCounter
         //todo handle if we have specific client patterns in the future
         $pattern = $client->getSetting('invoice_number_pattern');
         //Determine if we are using client_counters
-        if (strpos($pattern, 'clientCounter')) {
+        if (strpos($pattern, 'clientCounter') || strpos($pattern, 'client_counter')) {
             if (property_exists($client->settings, 'invoice_number_counter')) {
                 $counter = $client->settings->invoice_number_counter;
             } else {
@@ -57,7 +57,7 @@ trait GeneratesCounter
             }
 
             $counter_entity = $client;
-        } elseif (strpos($pattern, 'groupCounter')) {
+        } elseif (strpos($pattern, 'groupCounter') || strpos($pattern, 'group_counter')) {
             $counter = $client->group_settings->invoice_number_counter;
             $counter_entity = $client->group_settings;
         } else {
@@ -96,10 +96,10 @@ trait GeneratesCounter
         //todo handle if we have specific client patterns in the future
         $pattern = $client->getSetting('credit_number_pattern');
         //Determine if we are using client_counters
-        if (strpos($pattern, 'clientCounter')) {
+        if (strpos($pattern, 'clientCounter') || strpos($pattern, 'client_counter')) {
             $counter = $client->settings->credit_number_counter;
             $counter_entity = $client;
-        } elseif (strpos($pattern, 'groupCounter')) {
+        } elseif (strpos($pattern, 'groupCounter') || strpos($pattern, 'group_counter')) {
             $counter = $client->group_settings->credit_number_counter;
             $counter_entity = $client->group_settings;
         } else {
@@ -132,10 +132,10 @@ trait GeneratesCounter
         //todo handle if we have specific client patterns in the future
         $pattern = $client->getSetting('quote_number_pattern');
         //Determine if we are using client_counters
-        if (strpos($pattern, 'clientCounter')) {
+        if (strpos($pattern, 'clientCounter') || strpos($pattern, 'client_counter')) {
             $counter = $client->settings->{$used_counter};
             $counter_entity = $client;
-        } elseif (strpos($pattern, 'groupCounter')) {
+        } elseif (strpos($pattern, 'groupCounter') || strpos($pattern, 'group_counter')) {
             $counter = $client->group_settings->{$used_counter};
             $counter_entity = $client->group_settings;
         } else {