Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-10 05:04:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for generates counter

Browse Source
This commit is contained in:
= 2022-05-03 09:33:18 +10:00
parent 342cc10bc2
commit c7a9e2bac7
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Utils/Traits/GeneratesConvertedQuoteCounter.php
View File

@ -631,7 +631,7 @@ trait GeneratesConvertedQuoteCounter
} }
$search = ['{$year}']; $search = ['{$year}'];
$replace = [date('Y')]; $replace = [Carbon::now($entity->company->timezone()->name)->format('Y')];
$search[] = '{$counter}'; $search[] = '{$counter}';
$replace[] = $counter; $replace[] = $counter;
@ -646,8 +646,8 @@ trait GeneratesConvertedQuoteCounter
$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;
$search[] = '{$user_id}'; $search[] = '{$user_id}';

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

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