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

Bugfix where reset counter date is set but frequency is set to disabled

Browse Source
This commit is contained in:
David Bomba 2023-01-11 13:13:38 +11:00
parent 081d720ce5
commit f28a26d3f9
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -479,9 +479,20 @@ trait GeneratesConvertedQuoteCounter
$reset_counter_frequency = (int) $client->getSetting('reset_counter_frequency_id'); $reset_counter_frequency = (int) $client->getSetting('reset_counter_frequency_id');
if ($reset_counter_frequency == 0) { if ($reset_counter_frequency == 0) {
if($client->getSetting('reset_counter_date')){
$settings = $client->company->settings;
$settings->reset_counter_date = "";
$client->company->settings = $settings;
$client->company->save();
}
return; return;
} }
$timezone = Timezone::find($client->getSetting('timezone_id')); $timezone = Timezone::find($client->getSetting('timezone_id'));
$reset_date = Carbon::parse($client->getSetting('reset_counter_date'), $timezone->name); $reset_date = Carbon::parse($client->getSetting('reset_counter_date'), $timezone->name);

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

@ -519,6 +519,16 @@ trait GeneratesCounter
$reset_counter_frequency = (int) $client->getSetting('reset_counter_frequency_id'); $reset_counter_frequency = (int) $client->getSetting('reset_counter_frequency_id');
if ($reset_counter_frequency == 0) { if ($reset_counter_frequency == 0) {
if($client->getSetting('reset_counter_date')){
$settings = $client->company->settings;
$settings->reset_counter_date = "";
$client->company->settings = $settings;
$client->company->save();
}
return; return;
} }