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 counteR

Browse Source
This commit is contained in:
David Bomba 2021-01-10 21:45:02 +11:00
parent 41c84356f9
commit d26d26fccf
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,7 +49,7 @@ trait GeneratesCounter
//todo handle if we have specific client patterns in the future //todo handle if we have specific client patterns in the future
$pattern = $client->getSetting('invoice_number_pattern'); $pattern = $client->getSetting('invoice_number_pattern');
//Determine if we are using client_counters //Determine if we are using client_counters
if (strpos($pattern, 'clientCounter')) { if (strpos($pattern, 'clientCounter') || strpos($pattern, 'client_counter')) {
if (property_exists($client->settings, 'invoice_number_counter')) { if (property_exists($client->settings, 'invoice_number_counter')) {
$counter = $client->settings->invoice_number_counter; $counter = $client->settings->invoice_number_counter;
} else { } else {
@ -57,7 +57,7 @@ trait GeneratesCounter
} }
$counter_entity = $client; $counter_entity = $client;
} elseif (strpos($pattern, 'groupCounter')) { } elseif (strpos($pattern, 'groupCounter') || strpos($pattern, 'group_counter')) {
$counter = $client->group_settings->invoice_number_counter; $counter = $client->group_settings->invoice_number_counter;
$counter_entity = $client->group_settings; $counter_entity = $client->group_settings;
} else { } else {
@ -96,10 +96,10 @@ trait GeneratesCounter
//todo handle if we have specific client patterns in the future //todo handle if we have specific client patterns in the future
$pattern = $client->getSetting('credit_number_pattern'); $pattern = $client->getSetting('credit_number_pattern');
//Determine if we are using client_counters //Determine if we are using client_counters
if (strpos($pattern, 'clientCounter')) { if (strpos($pattern, 'clientCounter') || strpos($pattern, 'client_counter')) {
$counter = $client->settings->credit_number_counter; $counter = $client->settings->credit_number_counter;
$counter_entity = $client; $counter_entity = $client;
} elseif (strpos($pattern, 'groupCounter')) { } elseif (strpos($pattern, 'groupCounter') || strpos($pattern, 'group_counter')) {
$counter = $client->group_settings->credit_number_counter; $counter = $client->group_settings->credit_number_counter;
$counter_entity = $client->group_settings; $counter_entity = $client->group_settings;
} else { } else {
@ -132,10 +132,10 @@ trait GeneratesCounter
//todo handle if we have specific client patterns in the future //todo handle if we have specific client patterns in the future
$pattern = $client->getSetting('quote_number_pattern'); $pattern = $client->getSetting('quote_number_pattern');
//Determine if we are using client_counters //Determine if we are using client_counters
if (strpos($pattern, 'clientCounter')) { if (strpos($pattern, 'clientCounter') || strpos($pattern, 'client_counter')) {
$counter = $client->settings->{$used_counter}; $counter = $client->settings->{$used_counter};
$counter_entity = $client; $counter_entity = $client;
} elseif (strpos($pattern, 'groupCounter')) { } elseif (strpos($pattern, 'groupCounter') || strpos($pattern, 'group_counter')) {
$counter = $client->group_settings->{$used_counter}; $counter = $client->group_settings->{$used_counter};
$counter_entity = $client->group_settings; $counter_entity = $client->group_settings;
} else { } else {