From ee7ab54b389417939993f76fb822b98fdaa0d4d1 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 24 May 2023 22:26:10 +1000
Subject: [PATCH] Update company tax data

---
 app/Jobs/Company/CompanyTaxRate.php       | 45 +++++++++++++++++++++++
 app/Utils/Traits/CompanySettingsSaver.php |  2 +-
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 app/Jobs/Company/CompanyTaxRate.php

diff --git a/app/Jobs/Company/CompanyTaxRate.php b/app/Jobs/Company/CompanyTaxRate.php
new file mode 100644
index 000000000000..1abb6c848ab5
--- /dev/null
+++ b/app/Jobs/Company/CompanyTaxRate.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Jobs\Company;
+
+use App\Models\Company;
+use App\Libraries\MultiDB;
+use Illuminate\Bus\Queueable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Queue\InteractsWithQueue;
+use App\Services\Tax\Providers\TaxProvider;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+
+class CompanyTaxRate implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * Create a new job instance.
+     *
+     * @param Company $company
+     */
+    public function __construct(public Company $company)
+    {
+    }
+
+    public function handle()
+    {
+        MultiDB::setDB($this->company->db);
+
+        $tp = new TaxProvider($this->company);
+        $tp->updateCompanyTaxData();
+        
+    }
+
+}
\ No newline at end of file
diff --git a/app/Utils/Traits/CompanySettingsSaver.php b/app/Utils/Traits/CompanySettingsSaver.php
index df4245b817c7..0a351767659e 100644
--- a/app/Utils/Traits/CompanySettingsSaver.php
+++ b/app/Utils/Traits/CompanySettingsSaver.php
@@ -78,7 +78,7 @@ trait CompanySettingsSaver
 
         $entity->settings = $company_settings;
 
-        if(Ninja::isHosted() && $company_settings->country_id == "840" && array_key_exists('settings', $entity->getDirty())) 
+        if(Ninja::isHosted() && $entity?->calc_taxes && $company_settings->country_id == "840" && array_key_exists('settings', $entity->getDirty())) 
         {
             $old_settings = $entity->getOriginal()['settings'];