From d7d3c8d591bdcc343907953dcb0bba5e3641b403 Mon Sep 17 00:00:00 2001 From: = Date: Mon, 2 May 2022 12:50:55 +1000 Subject: [PATCH] Fixes for generates counter --- app/Utils/Traits/GeneratesCounter.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/Utils/Traits/GeneratesCounter.php b/app/Utils/Traits/GeneratesCounter.php index a1a10bd2f392..d8bce41b7d83 100644 --- a/app/Utils/Traits/GeneratesCounter.php +++ b/app/Utils/Traits/GeneratesCounter.php @@ -642,9 +642,12 @@ trait GeneratesCounter return $counter; } - $search = ['{$year}']; - $replace = [Carbon::now($entity->company->timezone()->name)->format('Y')]; - + $search = []; + $replace = []; + + // $search = ['{$year}']; + //$replace = [Carbon::now($entity->company->timezone()->name)->format('Y')]; + $search[] = '{$counter}'; $replace[] = $counter; @@ -658,7 +661,7 @@ trait GeneratesCounter $replace[] = $counter; $search[] = '{$year}'; - $replace = [Carbon::now($entity->company->timezone()->name)->format('Y')]; + $replace[] = [Carbon::now($entity->company->timezone()->name)->format('Y')]; if (strstr($pattern, '{$user_id}') || strstr($pattern, '{$userId}')) { $user_id = $entity->user_id ? $entity->user_id : 0;