Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for localizing dates for reset counter

Browse Source
This commit is contained in:
= 2022-05-02 08:20:54 +10:00
parent b0ae010e42
commit 6709e5bbc4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Utils/Traits/GeneratesCounter.php
View File

@ -643,7 +643,7 @@ trait GeneratesCounter
} }
$search = ['{$year}']; $search = ['{$year}'];
$replace = [date('Y')]; $replace = [Carbon::now($entity->company->timezone()->name)->format('Y')];
$search[] = '{$counter}'; $search[] = '{$counter}';
$replace[] = $counter; $replace[] = $counter;
@ -658,7 +658,7 @@ trait GeneratesCounter
$replace[] = $counter; $replace[] = $counter;
$search[] = '{$year}'; $search[] = '{$year}';
$replace[] = date('Y'); $replace = [Carbon::now($entity->company->timezone()->name)->format('Y')];
if (strstr($pattern, '{$user_id}') || strstr($pattern, '{$userId}')) { if (strstr($pattern, '{$user_id}') || strstr($pattern, '{$userId}')) {
$user_id = $entity->user_id ? $entity->user_id : 0; $user_id = $entity->user_id ? $entity->user_id : 0;