From 76b2e2290d0e760bf4381df8b59c792b4fca1faf Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 28 Apr 2023 16:42:15 +1000
Subject: [PATCH 1/2] Minor fixes

---
 app/DataMapper/Tax/ZipTax/Response.php               |  2 +-
 app/Factory/CompanyFactory.php                       | 12 +++++++-----
 app/Jobs/Company/CreateCompany.php                   | 10 ++++++----
 database/factories/CompanyFactory.php                |  4 +++-
 .../2023_04_27_045639_add_kmher_language.php         |  8 +++++++-
 5 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/app/DataMapper/Tax/ZipTax/Response.php b/app/DataMapper/Tax/ZipTax/Response.php
index 6fbed6ed72f5..f2655c50e8f1 100644
--- a/app/DataMapper/Tax/ZipTax/Response.php
+++ b/app/DataMapper/Tax/ZipTax/Response.php
@@ -103,7 +103,7 @@ class Response
     public function __construct($data)
     {
         if(!$data)
-            return;
+            return $this;
 
         foreach($data as $key => $value){
             $this->{$key} = $value;
diff --git a/app/Factory/CompanyFactory.php b/app/Factory/CompanyFactory.php
index fa8015149e84..e9487b54c0b7 100644
--- a/app/Factory/CompanyFactory.php
+++ b/app/Factory/CompanyFactory.php
@@ -11,12 +11,13 @@
 
 namespace App\Factory;
 
-use App\DataMapper\ClientRegistrationFields;
-use App\DataMapper\CompanySettings;
-use App\Libraries\MultiDB;
-use App\Models\Company;
 use App\Utils\Ninja;
+use App\Models\Company;
+use App\Libraries\MultiDB;
 use App\Utils\Traits\MakesHash;
+use App\DataMapper\Tax\TaxModel;
+use App\DataMapper\CompanySettings;
+use App\DataMapper\ClientRegistrationFields;
 
 class CompanyFactory
 {
@@ -48,7 +49,8 @@ class CompanyFactory
         $company->default_password_timeout = 1800000;
         $company->markdown_email_enabled = true;
         $company->markdown_enabled = false;
-
+        $company->tax_data = new TaxModel();
+        
         return $company;
     }
 }
diff --git a/app/Jobs/Company/CreateCompany.php b/app/Jobs/Company/CreateCompany.php
index 78dcff40618b..1c0328539a60 100644
--- a/app/Jobs/Company/CreateCompany.php
+++ b/app/Jobs/Company/CreateCompany.php
@@ -11,13 +11,14 @@
 
 namespace App\Jobs\Company;
 
-use App\DataMapper\ClientRegistrationFields;
-use App\DataMapper\CompanySettings;
-use App\Libraries\MultiDB;
-use App\Models\Company;
 use App\Utils\Ninja;
+use App\Models\Company;
+use App\Libraries\MultiDB;
 use App\Utils\Traits\MakesHash;
+use App\DataMapper\Tax\TaxModel;
+use App\DataMapper\CompanySettings;
 use Illuminate\Foundation\Bus\Dispatchable;
+use App\DataMapper\ClientRegistrationFields;
 
 class CreateCompany
 {
@@ -65,6 +66,7 @@ class CreateCompany
         $company->client_registration_fields = ClientRegistrationFields::generate();
         $company->markdown_email_enabled = true;
         $company->markdown_enabled = false;
+        $company->tax_data = new TaxModel();
 
         if (Ninja::isHosted()) {
             $company->subdomain = MultiDB::randomSubdomainGenerator();
diff --git a/database/factories/CompanyFactory.php b/database/factories/CompanyFactory.php
index d70a899bfbf4..05ba6aa1b8c9 100644
--- a/database/factories/CompanyFactory.php
+++ b/database/factories/CompanyFactory.php
@@ -11,8 +11,9 @@
 
 namespace Database\Factories;
 
-use App\DataMapper\CompanySettings;
 use App\Utils\Traits\MakesHash;
+use App\DataMapper\Tax\TaxModel;
+use App\DataMapper\CompanySettings;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class CompanyFactory extends Factory
@@ -38,6 +39,7 @@ class CompanyFactory extends Factory
             'custom_fields' => (object) [
             ],
             'company_key' => $this->createHash(),
+            'tax_data' => new TaxModel(),
         ];
     }
 }
diff --git a/database/migrations/2023_04_27_045639_add_kmher_language.php b/database/migrations/2023_04_27_045639_add_kmher_language.php
index 2da0ccdbe12f..9d2d7a994f95 100644
--- a/database/migrations/2023_04_27_045639_add_kmher_language.php
+++ b/database/migrations/2023_04_27_045639_add_kmher_language.php
@@ -1,6 +1,9 @@
 <?php
 
+use App\Models\Company;
 use App\Models\Language;
+use App\DataMapper\Tax\TaxModel;
+use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
@@ -26,7 +29,10 @@ return new class extends Migration
             $table->dropColumn('enable_e_invoice');
         });
 
-
+        Company::query()->cursor()->each(function ($company){
+            $company->tax_data = new TaxModel();
+            $company->save();
+        });
     }
 
     /**

From cf6cd98eec279172541780a9c528b93fd55e6750 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 28 Apr 2023 16:47:22 +1000
Subject: [PATCH 2/2] Minor fixes

---
 tests/Feature/Bank/BankTransactionRuleTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Feature/Bank/BankTransactionRuleTest.php b/tests/Feature/Bank/BankTransactionRuleTest.php
index b5156a61d655..c96291610e17 100644
--- a/tests/Feature/Bank/BankTransactionRuleTest.php
+++ b/tests/Feature/Bank/BankTransactionRuleTest.php
@@ -183,7 +183,7 @@ class BankTransactionRuleTest extends TestCase
 
         if ($response) {
             $arr = $response->json();
-            nlog($arr);
+           
             $response->assertStatus(200);
         }
     }