Update tax zone actions to use active column

lunarphp · Aug 15, 2024 · b0b6106 · b0b6106
1 parent c343ac3
commit b0b6106
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 8 deletions.
diff --git a/packages/core/database/factories/TaxZoneFactory.php b/packages/core/database/factories/TaxZoneFactory.php
@@ -15,7 +15,7 @@ public function definition(): array
             'name' => $this->faker->name,
             'zone_type' => $this->faker->randomElement(['country', 'postcode', 'state']),
             'price_display' => $this->faker->randomElement(['tax_inclusive', 'tax_exclusive']),
-            'active' => $this->faker->boolean,
+            'active' => true,
             'default' => true,
         ];
     }

diff --git a/packages/core/src/Actions/Taxes/GetTaxZoneCountry.php b/packages/core/src/Actions/Taxes/GetTaxZoneCountry.php
@@ -2,6 +2,7 @@
 
 namespace Lunar\Actions\Taxes;
 
+use Illuminate\Database\Eloquent\Builder;
 use Lunar\Models\TaxZoneCountry;
 
 class GetTaxZoneCountry
@@ -26,6 +27,9 @@ public function execute($countryId)
      */
     protected function getZone(int $countryId)
     {
-        return TaxZoneCountry::whereCountryId($countryId)->first();
+        return TaxZoneCountry::whereHas(
+            'taxZone',
+            fn (Builder $query) => $query->where('active', true)
+        )->whereCountryId($countryId)->first();
     }
 }
diff --git a/packages/core/src/Actions/Taxes/GetTaxZonePostcode.php b/packages/core/src/Actions/Taxes/GetTaxZonePostcode.php
@@ -2,6 +2,7 @@
 
 namespace Lunar\Actions\Taxes;
 
+use Illuminate\Database\Eloquent\Builder;
 use Lunar\Models\TaxZonePostcode;
 
 class GetTaxZonePostcode
@@ -49,11 +50,16 @@ protected function getZoneMatches($postcode)
     {
         $postcode = (string) $postcode;
 
-        if ($zone = TaxZonePostcode::wherePostcode($postcode)->first()) {
+        $query = TaxZonePostcode::whereHas(
+            'taxZone',
+            fn (Builder $query) => $query->where('active', true)
+        );
+
+        if ($zone = $query->clone()->wherePostcode($postcode)->first()) {
             return $zone;
         }
 
-        return TaxZonePostcode::where('postcode', 'LIKE', "{$postcode[0]}%")->get();
+        return $query->clone()->where('postcode', 'LIKE', "{$postcode[0]}%")->get();
     }
 
     /**

diff --git a/packages/core/src/Actions/Taxes/GetTaxZoneState.php b/packages/core/src/Actions/Taxes/GetTaxZoneState.php
@@ -37,6 +37,8 @@ protected function getZoneMatches($state)
             return $query
                 ->where('name', $state)
                 ->orWhere('code', $state);
+        })->whereHas('taxZone', function ($query) {
+            return $query->where('active', true);
         })->first();
 
         if ($stateZone) {

diff --git a/tests/core/Feature/Drivers/SystemTaxDriverTest.php b/tests/core/Feature/Drivers/SystemTaxDriverTest.php
@@ -1,6 +1,7 @@
 <?php
 
 uses(\Lunar\Tests\Core\TestCase::class);
+
 use Illuminate\Database\Eloquent\Factories\Sequence;
 use Illuminate\Support\Facades\Config;
 use Lunar\Base\ValueObjects\Cart\TaxBreakdown;
@@ -14,7 +15,7 @@
 use Lunar\Models\TaxRateAmount;
 use Lunar\Models\TaxZone;
 
-uses(\Illuminate\Foundation\Testing\RefreshDatabase::class);
+uses(\Illuminate\Foundation\Testing\RefreshDatabase::class)->group('taxes');
 
 test('can set shipping address', function () {
     $address = Address::factory()->create();

diff --git a/tests/core/Unit/Actions/Taxes/GetTaxZoneCountryTest.php b/tests/core/Unit/Actions/Taxes/GetTaxZoneCountryTest.php
@@ -1,11 +1,12 @@
 <?php
 
 uses(\Lunar\Tests\Core\TestCase::class);
+
 use Lunar\Actions\Taxes\GetTaxZoneCountry;
 use Lunar\Models\Country;
 use Lunar\Models\TaxZoneCountry;
 
-uses(\Illuminate\Foundation\Testing\RefreshDatabase::class);
+uses(\Illuminate\Foundation\Testing\RefreshDatabase::class)->group('taxes');
 
 test('can match country id', function () {
     $belgium = Country::factory()->create([

diff --git a/tests/core/Unit/Actions/Taxes/GetTaxZonePostcodeTest.php b/tests/core/Unit/Actions/Taxes/GetTaxZonePostcodeTest.php
@@ -1,10 +1,12 @@
 <?php
 
 uses(\Lunar\Tests\Core\TestCase::class);
+
 use Lunar\Actions\Taxes\GetTaxZonePostcode;
 use Lunar\Models\TaxZonePostcode;
 
-uses(\Illuminate\Foundation\Testing\RefreshDatabase::class);
+uses(\Illuminate\Foundation\Testing\RefreshDatabase::class)
+    ->group('taxes');
 
 test('can match exact postcode', function () {
     $uk = TaxZonePostcode::factory()->create([

diff --git a/tests/core/Unit/Actions/Taxes/GetTaxZoneTest.php b/tests/core/Unit/Actions/Taxes/GetTaxZoneTest.php
@@ -1,6 +1,7 @@
 <?php
 
 uses(\Lunar\Tests\Core\TestCase::class);
+
 use Lunar\Actions\Taxes\GetTaxZone;
 use Lunar\Models\Address;
 use Lunar\Models\Country;
@@ -10,7 +11,8 @@
 use Lunar\Models\TaxZonePostcode;
 use Lunar\Models\TaxZoneState;
 
-uses(\Illuminate\Foundation\Testing\RefreshDatabase::class);
+uses(\Illuminate\Foundation\Testing\RefreshDatabase::class)
+    ->group('taxes');
 
 test('can prioritize taxzones', function () {
     $postcode = 'SW1A 0AA';