From 6709e5bbc41ef9780f40657acd154ab902ea5c31 Mon Sep 17 00:00:00 2001 From: = Date: Mon, 2 May 2022 08:20:54 +1000 Subject: [PATCH] Fixes for localizing dates for reset counter --- app/Utils/Traits/GeneratesCounter.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Utils/Traits/GeneratesCounter.php b/app/Utils/Traits/GeneratesCounter.php index 0ed905279800..a1a10bd2f392 100644 --- a/app/Utils/Traits/GeneratesCounter.php +++ b/app/Utils/Traits/GeneratesCounter.php @@ -643,7 +643,7 @@ trait GeneratesCounter } $search = ['{$year}']; - $replace = [date('Y')]; + $replace = [Carbon::now($entity->company->timezone()->name)->format('Y')]; $search[] = '{$counter}'; $replace[] = $counter; @@ -658,7 +658,7 @@ trait GeneratesCounter $replace[] = $counter; $search[] = '{$year}'; - $replace[] = date('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;