mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Fixes for generates counter
This commit is contained in:
parent
e989644718
commit
d7d3c8d591
@ -642,9 +642,12 @@ trait GeneratesCounter
|
||||
return $counter;
|
||||
}
|
||||
|
||||
$search = ['{$year}'];
|
||||
$replace = [Carbon::now($entity->company->timezone()->name)->format('Y')];
|
||||
|
||||
$search = [];
|
||||
$replace = [];
|
||||
|
||||
// $search = ['{$year}'];
|
||||
//$replace = [Carbon::now($entity->company->timezone()->name)->format('Y')];
|
||||
|
||||
$search[] = '{$counter}';
|
||||
$replace[] = $counter;
|
||||
|
||||
@ -658,7 +661,7 @@ trait GeneratesCounter
|
||||
$replace[] = $counter;
|
||||
|
||||
$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}')) {
|
||||
$user_id = $entity->user_id ? $entity->user_id : 0;
|
||||
|
Loading…
x
Reference in New Issue
Block a user