Bump address to v3.3 - using Zoneable

vanilophp · Apr 10, 2024 · d6e7ada · d6e7ada
1 parent 21cd075
commit d6e7ada
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 75 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -12,6 +12,7 @@
 - Added Laravel 11 Support
 - Changed minimum Laravel version to v10.43
 - Changed minimal Enum requirement to v4.2
+- Changed minimal Address module requirement to v3.3
 - Upgraded to Konekt Address, Customer and User modules to v3
 - Upgraded to Laravel Media Library v11
 - Removed the Vanilo v2 `Framework` namespace compatibility layer

diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
         "spatie/laravel-medialibrary": "^11.0",
         "cviebrock/eloquent-sluggable": "^10.0|^11.0",
         "konekt/laravel-migration-compatibility": "^1.6",
-        "konekt/address": "^3.1",
+        "konekt/address": "^3.3.1",
         "konekt/customer": "^3.0",
         "konekt/user": "^3.0",
         "konekt/search": "^1.2",

diff --git a/src/Channel/composer.json b/src/Channel/composer.json
@@ -27,10 +27,10 @@
         "phpunit/phpunit": "^10.0",
         "orchestra/testbench": "^8.0|^9.0",
         "laravel/legacy-factories": "^1.0",
-        "konekt/address": "^3.0"
+        "konekt/address": "^3.3.1"
     },
     "suggest": {
-        "konekt/address": "To support billing and shipping zones (^3.0)"
+        "konekt/address": "To support billing and shipping zones (^3.3)"
     },
     "autoload": {
         "psr-4": { "Vanilo\\Channel\\": "" }

diff --git a/src/Checkout/Changelog.md b/src/Checkout/Changelog.md
@@ -12,6 +12,7 @@
 - Added Laravel 11 Support
 - Changed minimum Laravel version to v10.43
 - Changed minimal Enum requirement to v4.2
+- Changed minimal Address requirement to v3.3
 - Added the `BillpayerChanged` event
 - BC: Removed the following traits:
   - `HasCart`

diff --git a/src/Checkout/composer.json b/src/Checkout/composer.json
@@ -27,7 +27,7 @@
     "require-dev": {
         "phpunit/phpunit": "^10.0",
         "orchestra/testbench": "^8.0|^9.0",
-        "konekt/address": "^3.0"
+        "konekt/address": "^3.3.1"
     },
     "autoload": {
         "psr-4": { "Vanilo\\Checkout\\": "" }

diff --git a/src/Order/composer.json b/src/Order/composer.json
@@ -18,7 +18,7 @@
     ],
     "require": {
         "php": "^8.2",
-        "konekt/address": "^3.0",
+        "konekt/address": "^3.3.1",
         "konekt/concord": "^1.13",
         "konekt/enum": "^4.2",
         "konekt/laravel-migration-compatibility": "^1.6",

diff --git a/src/Shipment/Changelog.md b/src/Shipment/Changelog.md
@@ -12,6 +12,7 @@
 - Added Laravel 11 Support
 - Changed minimum Laravel version to v10.43
 - Changed minimal Enum requirement to v4.2
+- Changed minimal Address module requirement to v3.3
 - Added `isZoneRestricted()` & `isNotZoneRestricted()` helper methods to the `ShippingMethod` class
 - BC: Changed the ShippingFeeCalculator, Carrier and Shipment interfaces to Configurable & Schematized
 - BC: Added the `getCalculator()` & `estimate()` methods to the `ShippingMethod` interface

diff --git a/src/Shipment/Models/ShippingMethod.php b/src/Shipment/Models/ShippingMethod.php
@@ -16,10 +16,9 @@
 
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Support\Collection;
+use Konekt\Address\Concerns\Zoneable;
 use Konekt\Address\Contracts\Zone;
-use Konekt\Address\Models\ZoneProxy;
 use Vanilo\Contracts\Schematized;
 use Vanilo\Shipment\Calculators\NullShippingFeeCalculator;
 use Vanilo\Shipment\Contracts\ShippingFeeCalculator;
@@ -38,19 +37,16 @@
  * @property boolean $is_active
  * @property array $configuration
  *
- * @property-read Zone|null $zone
- *
  * @method static Builder actives()
  * @method static Builder inactives()
- * @method static Builder forZone(Zone|int $zone)
- * @method static Builder forZones(array|Collection $zones)
  *
  * @method static ShippingMethod create(array $attributes)
  */
 class ShippingMethod extends Model implements ShippingMethodContract
 {
     use BelongsToCarrier;
     use ConfigurableModel;
+    use Zoneable;
 
     protected $guarded = ['id', 'created_at', 'updated_at'];
 
@@ -85,26 +81,11 @@ public function estimate(?object $subject = null): ShippingFee
         return $this->getCalculator()->calculate($subject, $this->configuration());
     }
 
-    public function isZoneRestricted(): bool
-    {
-        return null !== $this->zone_id;
-    }
-
-    public function isNotZoneRestricted(): bool
-    {
-        return !$this->isZoneRestricted();
-    }
-
     public function getConfigurationSchema(): ?Schematized
     {
         return SchemaDefinition::wrap($this->getCalculator());
     }
 
-    public function zone(): BelongsTo
-    {
-        return $this->belongsTo(ZoneProxy::modelClass(), 'zone_id', 'id');
-    }
-
     public function scopeActives(Builder $query): Builder
     {
         return $query->where('is_active', true);
@@ -114,20 +95,4 @@ public function scopeInactives(Builder $query): Builder
     {
         return $query->where('is_active', false);
     }
-
-    public function scopeForZone(Builder $query, Zone|int $zone): Builder
-    {
-        return $query->where('zone_id', is_int($zone) ? $zone : $zone->id);
-    }
-
-    public function scopeForZones(Builder $query, array|Collection $zones): Builder
-    {
-        if (is_array($zones)) {
-            $zones = array_map(fn (Zone|int $zone) => is_int($zone) ? $zone : $zone->id, $zones);
-        } else {
-            $zones = $zones->map(fn (Zone $zone) => $zone->id);
-        }
-
-        return $query->whereIn('zone_id', $zones);
-    }
 }
diff --git a/src/Shipment/composer.json b/src/Shipment/composer.json
@@ -18,7 +18,7 @@
     ],
     "require": {
         "php": "^8.2",
-        "konekt/address": "^3.0",
+        "konekt/address": "^3.3.1",
         "konekt/concord": "^1.13",
         "konekt/enum": "^4.2",
         "konekt/laravel-migration-compatibility": "^1.6",

diff --git a/src/Support/composer.json b/src/Support/composer.json
@@ -34,7 +34,7 @@
     "suggest": {
         "spatie/laravel-medialibrary": "Allows associating images or other files with Eloquent models (^11.0)",
         "konekt/concord": "Library to write Modular Applications (^1.13)",
-        "konekt/address": "Improves the EU membership and VAT ID validation (^3.1)"
+        "konekt/address": "Improves the EU membership and VAT ID validation (^3.3)"
     },
     "extra": {
         "branch-alias": {

diff --git a/src/Taxes/Changelog.md b/src/Taxes/Changelog.md
@@ -7,7 +7,7 @@
 
 - Dropped PHP 8.0 & PHP 8.1 Support
 - Dropped Laravel 9 Support
-- Upgraded to Konekt Address v3
+- Upgraded to Konekt Address v3.3+
 - Added PHP 8.3 Support
 - Added Laravel 11 Support
 - Changed minimum Laravel version to v10.43

diff --git a/src/Taxes/Models/TaxRate.php b/src/Taxes/Models/TaxRate.php
@@ -19,6 +19,7 @@
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
+use Konekt\Address\Concerns\Zoneable;
 use Konekt\Address\Contracts\Zone;
 use Konekt\Address\Models\ZoneProxy;
 use Vanilo\Contracts\Schematized;
@@ -45,18 +46,16 @@
  * @property Carbon $created_at
  * @property Carbon $updated_at
  * @property-read TaxCategory|null $taxCategory
- * @property-read Zone|null $zone
  *
  * @method static Builder byTaxCategory(TaxCategory|int $taxCategory)
- * @method Builder forZone(Zone|int $zone)
- * @method Builder forZones(array|Collection $zones)
  * @method Builder actives()
  * @method Builder inactives()
  */
 class TaxRate extends Model implements TaxRateContract
 {
     use BelongsToTaxCategory;
     use ConfigurableModel;
+    use Zoneable;
 
     protected $guarded = ['id', 'created_at', 'updated_at'];
 
@@ -97,11 +96,6 @@ public function getName(): string
         return $this->name;
     }
 
-    public function getZone(): ?Zone
-    {
-        return $this->zone;
-    }
-
     public function getTaxCategory(): ?TaxCategory
     {
         return $this->taxCategory;
@@ -126,11 +120,6 @@ public function getConfigurationSchema(): ?Schematized
         return SchemaDefinition::wrap($this->getCalculator());
     }
 
-    public function zone(): BelongsTo
-    {
-        return $this->belongsTo(ZoneProxy::modelClass(), 'zone_id', 'id');
-    }
-
     public function scopeActives(Builder $query): Builder
     {
         return $query->where('is_active', true);
@@ -141,22 +130,6 @@ public function scopeInactives(Builder $query): Builder
         return $query->where('is_active', false);
     }
 
-    public function scopeForZone(Builder $query, Zone|int $zone): Builder
-    {
-        return $query->where('zone_id', is_int($zone) ? $zone : $zone->id);
-    }
-
-    public function scopeForZones(Builder $query, array|Collection $zones): Builder
-    {
-        if (is_array($zones)) {
-            $zones = array_map(fn (Zone|int $zone) => is_int($zone) ? $zone : $zone->id, $zones);
-        } else {
-            $zones = $zones->map(fn (Zone $zone) => $zone->id);
-        }
-
-        return $query->whereIn('zone_id', $zones);
-    }
-
     public function scopeByTaxCategory(Builder $query, TaxCategory|int $taxCategory): Builder
     {
         return $query->where('tax_category_id', is_int($taxCategory) ? $taxCategory : $taxCategory->id);

diff --git a/src/Taxes/composer.json b/src/Taxes/composer.json
@@ -19,7 +19,7 @@
     "require": {
         "php": "^8.2",
         "konekt/concord": "^1.13",
-        "konekt/address": "^3.0",
+        "konekt/address": "^3.3.1",
         "konekt/enum": "^4.2",
         "konekt/laravel-migration-compatibility": "^1.6",
         "laravel/framework": "^10.43|^11.0",