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

Backward compatiblity for custom counters

Browse Source
This commit is contained in:
David Bomba 2021-06-23 22:55:01 +10:00
parent fc1a605046
commit 7e6e1d3de0
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -568,13 +568,21 @@ trait GeneratesCounter
$search[] = '{$client_counter}'; $search[] = '{$client_counter}';
$replace[] = $counter; $replace[] = $counter;
$search[] = '{$clientCounter}';
$replace[] = $counter;
$search[] = '{$group_counter}'; $search[] = '{$group_counter}';
$replace[] = $counter; $replace[] = $counter;
if (strstr($pattern, '{$user_id}')) { $search[] = '{$year}';
$replace[] = date('Y');
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}';
$replace[] = str_pad(($user_id), 2, '0', STR_PAD_LEFT); $replace[] = str_pad(($user_id), 2, '0', STR_PAD_LEFT);
$search[] = '{$userId}';
$replace[] = str_pad(($user_id), 2, '0', STR_PAD_LEFT);
} }
$matches = false; $matches = false;
@ -624,9 +632,15 @@ trait GeneratesCounter
$search[] = '{$client_custom1}'; $search[] = '{$client_custom1}';
$replace[] = $client->custom_value1; $replace[] = $client->custom_value1;
$search[] = '{$clientCustom1}';
$replace[] = $client->custom_value1;
$search[] = '{$client_custom2}'; $search[] = '{$client_custom2}';
$replace[] = $client->custom_value2; $replace[] = $client->custom_value2;
$search[] = '{$clientCustom2}';
$replace[] = $client->custom_value2;
$search[] = '{$client_custom3}'; $search[] = '{$client_custom3}';
$replace[] = $client->custom_value3; $replace[] = $client->custom_value3;
@ -638,6 +652,9 @@ trait GeneratesCounter
$search[] = '{$client_id_number}'; $search[] = '{$client_id_number}';
$replace[] = $client->id_number; $replace[] = $client->id_number;
$search[] = '{$clientIdNumber}';
$replace[] = $client->id_number;
} }
return str_replace($search, $replace, $pattern); return str_replace($search, $replace, $pattern);