From f28a26d3f94edad137b73792fab655d6016fd69a Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 11 Jan 2023 13:13:38 +1100 Subject: [PATCH] Bugfix where reset counter date is set but frequency is set to disabled --- app/Utils/Traits/GeneratesConvertedQuoteCounter.php | 11 +++++++++++ app/Utils/Traits/GeneratesCounter.php | 10 ++++++++++ 2 files changed, 21 insertions(+) diff --git a/app/Utils/Traits/GeneratesConvertedQuoteCounter.php b/app/Utils/Traits/GeneratesConvertedQuoteCounter.php index 39012ecfb452..713d17f2568d 100644 --- a/app/Utils/Traits/GeneratesConvertedQuoteCounter.php +++ b/app/Utils/Traits/GeneratesConvertedQuoteCounter.php @@ -479,9 +479,20 @@ trait GeneratesConvertedQuoteCounter $reset_counter_frequency = (int) $client->getSetting('reset_counter_frequency_id'); 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; } + $timezone = Timezone::find($client->getSetting('timezone_id')); $reset_date = Carbon::parse($client->getSetting('reset_counter_date'), $timezone->name); diff --git a/app/Utils/Traits/GeneratesCounter.php b/app/Utils/Traits/GeneratesCounter.php index 2aacaf39f469..0484facd316a 100644 --- a/app/Utils/Traits/GeneratesCounter.php +++ b/app/Utils/Traits/GeneratesCounter.php @@ -519,6 +519,16 @@ trait GeneratesCounter $reset_counter_frequency = (int) $client->getSetting('reset_counter_frequency_id'); 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; }