Update zone relation on carrier, country and payment method Model (#265)

* Update zone relation on carrier, country and payment method Model * fix code formatting --------- Co-authored-by: mckenziearts <[email protected]>
shopperlabs · Jul 6, 2024 · e600dda · e600dda
1 parent bf6a78d
commit e600dda
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 12 deletions.
diff --git a/packages/core/src/Models/Carrier.php b/packages/core/src/Models/Carrier.php
@@ -9,6 +9,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Shopper\Core\Traits\HasSlug;
+use Shopper\Core\Traits\HasZones;
 
 /**
  * @property-read int $id
@@ -25,6 +26,7 @@ class Carrier extends Model
 {
     use HasFactory;
     use HasSlug;
+    use HasZones;
 
     protected $fillable = [
         'name',

diff --git a/packages/core/src/Models/Country.php b/packages/core/src/Models/Country.php
@@ -7,7 +7,7 @@
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\MorphOne;
+use Shopper\Core\Traits\HasZones;
 
 /**
  * @property-read int $id
@@ -27,6 +27,7 @@
 class Country extends Model
 {
     use HasFactory;
+    use HasZones;
 
     public $timestamps = false;
 
@@ -64,9 +65,4 @@ public function svgFlag(): Attribute
             fn () => url(shopper()->prefix() . '/images/flags/' . mb_strtolower($this->cca2) . '.svg')
         );
     }
-
-    public function zone(): MorphOne
-    {
-        return $this->morphOne(ZoneRelation::class, 'zonable');
-    }
 }
diff --git a/packages/core/src/Models/PaymentMethod.php b/packages/core/src/Models/PaymentMethod.php
@@ -5,9 +5,11 @@
 namespace Shopper\Core\Models;
 
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Shopper\Core\Traits\HasSlug;
+use Shopper\Core\Traits\HasZones;
 
 /**
  * @property-read int $id
@@ -21,6 +23,7 @@ class PaymentMethod extends Model
 {
     use HasFactory;
     use HasSlug;
+    use HasZones;
 
     protected $guarded = [];
 
@@ -37,13 +40,11 @@ public function getTable(): string
         return shopper_table('payment_methods');
     }
 
-    public function getLogoUrlAttribute(): ?string
+    public function LogoUrl(): ?Attribute
     {
-        if ($this->logo) {
-            return shopper_asset($this->logo);
-        }
-
-        return null;
+        return Attribute::make(
+            get: fn () => $this->logo ? shopper_asset($this->logo) : null,
+        );
     }
 
     public function scopeEnabled(Builder $query): Builder

diff --git a/packages/core/src/Models/Zone.php b/packages/core/src/Models/Zone.php
@@ -27,6 +27,7 @@
  * @property \Shopper\Core\Models\Currency $currency
  * @property \Illuminate\Database\Eloquent\Collection $carriers
  * @property \Illuminate\Database\Eloquent\Collection $shippingOptions
+ * @property \Illuminate\Database\Eloquent\Collection $paymentMethods
  */
 class Zone extends Model
 {

diff --git a/packages/core/src/Traits/HasZones.php b/packages/core/src/Traits/HasZones.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shopper\Core\Traits;
+
+use Illuminate\Database\Eloquent\Relations\MorphToMany;
+use Shopper\Core\Models\Zone;
+
+trait HasZones
+{
+    public function zones(): MorphToMany
+    {
+        return $this->morphToMany(Zone::class, 'zonable', shopper_table('zone_has_relations'));
+    }
+}