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 generates counter

Browse Source
This commit is contained in:
= 2022-05-02 12:50:55 +10:00
parent e989644718
commit d7d3c8d591
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -642,9 +642,12 @@ trait GeneratesCounter
return $counter; return $counter;
} }
$search = ['{$year}']; $search = [];
$replace = [Carbon::now($entity->company->timezone()->name)->format('Y')]; $replace = [];
// $search = ['{$year}'];
//$replace = [Carbon::now($entity->company->timezone()->name)->format('Y')];
$search[] = '{$counter}'; $search[] = '{$counter}';
$replace[] = $counter; $replace[] = $counter;
@ -658,7 +661,7 @@ trait GeneratesCounter
$replace[] = $counter; $replace[] = $counter;
$search[] = '{$year}'; $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}')) { 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;