Fixes for localizing dates for reset counter
This commit is contained in:
parent
b0ae010e42
commit
6709e5bbc4
1 changed files with 2 additions and 2 deletions
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue