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 client_id_number placeholder for generatescounter

Browse Source
This commit is contained in:
= 2021-01-02 09:32:58 +11:00
parent 6c098160df
commit 0f70579b72
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -628,21 +628,24 @@ trait GeneratesCounter
$replace[] = $entity->id_number; $replace[] = $entity->id_number;
} }
if ($entity->client) { if ($entity->client || ($entity instanceof Client)) {
$client = $entity->client ?: $entity;
$search[] = '{$client_custom1}'; $search[] = '{$client_custom1}';
$replace[] = $entity->client->custom_value1; $replace[] = $client->custom_value1;
$search[] = '{$client_custom2}'; $search[] = '{$client_custom2}';
$replace[] = $entity->client->custom_value2; $replace[] = $client->custom_value2;
$search[] = '{$client_custom3}'; $search[] = '{$client_custom3}';
$replace[] = $entity->client->custom_value3; $replace[] = $client->custom_value3;
$search[] = '{$client_custom4}'; $search[] = '{$client_custom4}';
$replace[] = $entity->client->custom_value4; $replace[] = $client->custom_value4;
$search[] = '{$client_id_number}'; $search[] = '{$client_id_number}';
$replace[] = $entity->client->id_number; $replace[] = $client->id_number;
} }
return str_replace($search, $replace, $pattern); return str_replace($search, $replace, $pattern);