From 0c64e38208d2ff2f20a5fcc198974713d9f1155f Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 5 Jan 2024 18:42:44 +1100
Subject: [PATCH] Reset counters at client and group levels

---
 app/Utils/Traits/GeneratesCounter.php |  18 ++--
 tests/Unit/GeneratesCounterTest.php   | 144 +++++++++++++++++++++++---
 2 files changed, 142 insertions(+), 20 deletions(-)

diff --git a/app/Utils/Traits/GeneratesCounter.php b/app/Utils/Traits/GeneratesCounter.php
index 89c69b107391..bf49f5438cad 100644
--- a/app/Utils/Traits/GeneratesCounter.php
+++ b/app/Utils/Traits/GeneratesCounter.php
@@ -510,13 +510,17 @@ trait GeneratesCounter
     private function resetCounters(Client $client)
     {
         $reset_counter_frequency = (int) $client->getSetting('reset_counter_frequency_id');
+        $settings_entity = $client->getSettingEntity('reset_counter_frequency_id');
+        $settings = $settings_entity->settings;
 
         if ($reset_counter_frequency == 0) {
             if ($client->getSetting('reset_counter_date')) {
-                $settings = $client->company->settings;
+                // $settings = $client->company->settings;
                 $settings->reset_counter_date = "";
-                $client->company->settings = $settings;
-                $client->company->save();
+                $settings_entity->settings = $settings;
+                $settings_entity->saveQuietly();
+                // $client->company->settings = $settings;
+                // $client->company->save();
             }
 
             return;
@@ -570,7 +574,7 @@ trait GeneratesCounter
                 break;
         }
 
-        $settings = $client->company->settings;
+        // $settings = $client->company->settings;
         $settings->reset_counter_date = $new_reset_date->format('Y-m-d');
         $settings->invoice_number_counter = 1;
         $settings->quote_number_counter = 1;
@@ -583,8 +587,10 @@ trait GeneratesCounter
         $settings->recurring_expense_number_counter = 1;
         $settings->purchase_order_number_counter = 1;
 
-        $client->company->settings = $settings;
-        $client->company->save();
+        // $client->company->settings = $settings;
+        // $client->company->save();
+        $settings_entity->settings = $settings;
+        $settings_entity->saveQuietly();
     }
 
     private function resetCompanyCounters($company)
diff --git a/tests/Unit/GeneratesCounterTest.php b/tests/Unit/GeneratesCounterTest.php
index 6d9be6b50004..2bfc84619546 100644
--- a/tests/Unit/GeneratesCounterTest.php
+++ b/tests/Unit/GeneratesCounterTest.php
@@ -11,23 +11,24 @@
 
 namespace Tests\Unit;
 
-use App\DataMapper\ClientSettings;
+use Tests\TestCase;
+use App\Models\Quote;
+use App\Models\Client;
+use App\Models\Credit;
+use App\Models\Company;
+use App\Models\Invoice;
+use App\Models\Timezone;
+use Tests\MockAccountData;
+use App\Models\GroupSetting;
 use App\Factory\ClientFactory;
 use App\Factory\VendorFactory;
-use App\Models\Client;
-use App\Models\Company;
-use App\Models\Credit;
-use App\Models\Invoice;
-use App\Models\Quote;
-use App\Models\RecurringInvoice;
-use App\Models\Timezone;
-use App\Utils\Traits\GeneratesCounter;
 use App\Utils\Traits\MakesHash;
+use App\Models\RecurringInvoice;
+use App\DataMapper\ClientSettings;
+use App\Utils\Traits\GeneratesCounter;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Session;
-use Tests\MockAccountData;
-use Tests\TestCase;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
 
 /**
  * @test
@@ -53,6 +54,121 @@ class GeneratesCounterTest extends TestCase
         $this->makeTestData();
     }
 
+    public function testResetCounterGroup()
+    {
+        $timezone = Timezone::find(1);
+
+        $date_formatted = now($timezone->name)->format('Ymd');
+
+        $gs = new GroupSetting;        
+        $gs->name = 'Test';
+        $gs->company_id = $this->client->company_id;
+        $gs->settings = ClientSettings::buildClientSettings($this->company->settings, $this->client->settings);
+        $gs->save();
+
+        $this->client->group_settings_id = $gs->id;
+        $this->client->save();
+
+        $settings = $gs->settings;
+        // $settings = $this->client->settings;
+        $settings->invoice_number_pattern = '{$date:Ymd}-{$group_counter}';
+        $settings->timezone_id = 1;        
+        $gs->settings = $settings;
+        $gs->save();
+
+        $invoice_number = $this->getNextInvoiceNumber($this->client->fresh(), $this->invoice->fresh());
+        $this->assertEquals($date_formatted.'-0001', $invoice_number);
+        $invoice_number = $this->getNextInvoiceNumber($this->client->fresh(), $this->invoice->fresh());
+        $this->assertEquals($date_formatted.'-0002', $invoice_number);
+        $invoice_number = $this->getNextInvoiceNumber($this->client->fresh(), $this->invoice->fresh());
+        $this->assertEquals($date_formatted.'-0003', $invoice_number);
+        $invoice_number = $this->getNextInvoiceNumber($this->client->fresh(), $this->invoice->fresh());
+        $this->assertEquals($date_formatted.'-0004', $invoice_number);
+
+        $settings->reset_counter_date = now($timezone->name)->format('Y-m-d');
+        $settings->reset_counter_frequency_id = RecurringInvoice::FREQUENCY_DAILY;
+        $gs->settings = $settings;
+        $gs->save();
+
+        $this->travel(5)->days();
+        $date_formatted = now($timezone->name)->format('Ymd');
+
+        $invoice_number = $this->getNextInvoiceNumber($this->client->fresh(), $this->invoice->fresh());
+        $this->assertEquals($date_formatted.'-0001', $invoice_number);
+
+        $this->invoice->number = $invoice_number;
+        $this->invoice->save();
+
+        $invoice_number = $this->getNextInvoiceNumber($this->client->fresh(), $this->invoice->fresh());
+        $this->assertEquals($date_formatted.'-0002', $invoice_number);
+
+        $settings->reset_counter_date = now($timezone->name)->format('Y-m-d');
+        $settings->reset_counter_frequency_id = RecurringInvoice::FREQUENCY_DAILY;
+        $gs->settings = $settings;
+        $gs->save();
+
+        $this->travel(5)->days();
+        $date_formatted = now($timezone->name)->format('Ymd');
+
+        $invoice_number = $this->getNextInvoiceNumber($this->client->fresh(), $this->invoice->fresh());
+        $this->assertEquals($date_formatted.'-0001', $invoice_number);
+
+        $this->travelBack();
+    }
+
+
+    public function testResetCounterClient()
+    {
+        $timezone = Timezone::find(1);
+
+        $date_formatted = now($timezone->name)->format('Ymd');
+
+        $settings = $this->client->settings;
+        $settings->invoice_number_pattern = '{$date:Ymd}-{$client_counter}';
+        $settings->timezone_id = 1;
+        $this->client->settings = $settings;
+        $this->client->save();
+
+        $invoice_number = $this->getNextInvoiceNumber($this->client->fresh(), $this->invoice->fresh());
+        $this->assertEquals($date_formatted.'-0001', $invoice_number);
+        $invoice_number = $this->getNextInvoiceNumber($this->client->fresh(), $this->invoice->fresh());
+        $this->assertEquals($date_formatted.'-0002', $invoice_number);
+        $invoice_number = $this->getNextInvoiceNumber($this->client->fresh(), $this->invoice->fresh());
+        $this->assertEquals($date_formatted.'-0003', $invoice_number);
+        $invoice_number = $this->getNextInvoiceNumber($this->client->fresh(), $this->invoice->fresh());
+        $this->assertEquals($date_formatted.'-0004', $invoice_number);
+
+        $settings->reset_counter_date = now($timezone->name)->format('Y-m-d');
+        $settings->reset_counter_frequency_id = RecurringInvoice::FREQUENCY_DAILY;
+        $this->client->settings = $settings;
+        $this->client->save();
+
+        $this->travel(5)->days();
+        $date_formatted = now($timezone->name)->format('Ymd');
+
+        $invoice_number = $this->getNextInvoiceNumber($this->client->fresh(), $this->invoice->fresh());
+        $this->assertEquals($date_formatted.'-0001', $invoice_number);
+
+        $this->invoice->number = $invoice_number;
+        $this->invoice->save();
+
+        $invoice_number = $this->getNextInvoiceNumber($this->client->fresh(), $this->invoice->fresh());
+        $this->assertEquals($date_formatted.'-0002', $invoice_number);
+
+        $settings->reset_counter_date = now($timezone->name)->format('Y-m-d');
+        $settings->reset_counter_frequency_id = RecurringInvoice::FREQUENCY_DAILY;
+        $this->client->settings = $settings;
+        $this->client->save();
+
+        $this->travel(5)->days();
+        $date_formatted = now($timezone->name)->format('Ymd');
+
+        $invoice_number = $this->getNextInvoiceNumber($this->client->fresh(), $this->invoice->fresh());
+        $this->assertEquals($date_formatted.'-0001', $invoice_number);
+
+        $this->travelBack();
+    }
+
     public function testResetCounter()
     {
         $timezone = Timezone::find(1);
@@ -82,8 +198,8 @@ class GeneratesCounterTest extends TestCase
         $this->company->settings = $settings;
         $this->company->save();
 
-        $this->client->settings = $settings;
-        $this->client->save();
+        // $this->client->settings = $settings;
+        // $this->client->save();
 
         $this->travel(5)->days();
         $date_formatted = now($timezone->name)->format('Ymd');