cleaning day

app/Models/Shop/Category.php

@@ -6,6 +6,7 @@ use App\Repositories\Shop\SaleChannels;
 use Cesargb\Database\Support\CascadeDelete;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
+use Illuminate\Database\Eloquent\Relations\MorphToMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Kalnoy\Nestedset\NestedSet;
 use Rinvex\Categories\Models\Category as parentCategory;
@@ -35,7 +36,7 @@ class Category extends parentCategory
         NestedSet::PARENT_ID,
     ];
 
-    public function Articles()
+    public function Articles(): MorphToMany
     {
         return $this->morphedByMany(Article::class, 'categorizable');
     }

app/Models/Shop/Customer.php

@@ -4,6 +4,8 @@ namespace App\Models\Shop;
 
 use App\Notifications\ResetPassword;
 use App\Notifications\VerifyEmail;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
@@ -23,27 +25,27 @@ class Customer extends Authenticatable
 
     protected $casts = ['email_verified_at' => 'datetime'];
 
-    public function delivery_addresses()
+    public function delivery_addresses(): HasMany
     {
         return $this->addresses()->byDelivery();
     }
 
-    public function invoice_addresses()
+    public function invoice_addresses(): HasMany
     {
         return $this->addresses()->byInvoicing();
     }
 
-    public function addresses()
+    public function addresses(): HasMany
     {
         return $this->hasMany(CustomerAddress::class);
     }
 
-    public function customer_deliveries()
+    public function customer_deliveries(): HasMany
     {
         return $this->hasMany(CustomerDelivery::class);
     }
 
-    public function customer_sale_channels()
+    public function customer_sale_channels(): HasMany
     {
         return $this->hasMany(CustomerSaleChannel::class);
     }
@@ -54,17 +56,17 @@ class Customer extends Authenticatable
             ->whereNull('shop_customer_sale_channels.deleted_at');
     }
 
-    public function sale_channels()
+    public function sale_channels(): BelongsToMany
     {
         return $this->belongsToMany(SaleChannel::class, CustomerSaleChannel::class)->wherePivotNull('deleted_at');
     }
 
-    public function invoices()
+    public function invoices(): HasMany
     {
         return $this->hasMany(Invoice::class);
     }
 
-    public function orders()
+    public function orders(): HasMany
     {
         return $this->hasMany(Order::class);
     }

app/Models/Shop/Delivery.php

@@ -3,6 +3,8 @@
 namespace App\Models\Shop;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Staudenmeir\EloquentHasManyDeep\HasRelationships;
 use Venturecraft\Revisionable\RevisionableTrait;
@@ -33,12 +35,12 @@ class Delivery extends Model
         'event_date_end',
     ];
 
-    public function customers()
+    public function customers(): HasManyThrough
     {
         return $this->hasManyThrough(Customer::class, CustomerSaleChannel::class);
     }
 
-    public function sale_channel()
+    public function sale_channel(): BelongsTo
     {
         return $this->belongsTo(SaleChannel::class);
     }

app/Models/Shop/DeliveryTypeCalculation.php

@@ -3,6 +3,7 @@
 namespace App\Models\Shop;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Venturecraft\Revisionable\RevisionableTrait;
 use Wildside\Userstamps\Userstamps;
@@ -19,7 +20,7 @@ class DeliveryTypeCalculation extends Model
 
     protected $keepRevisionOf = ['type_id', 'weight', 'price'];
 
-    public function delivery_type()
+    public function delivery_type(): BelongsTo
     {
         return $this->belongsTo(DeliveryType::class, 'type_id');
     }

app/Models/Shop/DistributionChannel.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Models\Shop;
-
-use Illuminate\Database\Eloquent\Model;
-use Staudenmeir\EloquentHasManyDeep\HasRelationships;
-
-class DistributionChannel extends Model
-{
-    use HasRelationships;
-
-    protected $guarded = ['id'];
-
-    protected $table = 'shop_distribution_channel';
-
-    public function tariff_generics()
-    {
-        return $this->hasMany(TariffGeneric::class);
-    }
-}

app/Models/Shop/Invoice.php

@@ -3,6 +3,8 @@
 namespace App\Models\Shop;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use LaracraftTech\LaravelDateScopes\DateScopes;
 use Venturecraft\Revisionable\RevisionableTrait;
@@ -20,22 +22,22 @@ class Invoice extends Model
 
     protected $dontKeepRevisionOf = ['updated_by', 'updated_at'];
 
-    public function payments()
+    public function payments(): HasMany
     {
         return $this->hasMany(InvoicePayment::class);
     }
 
-    public function order()
+    public function order(): BelongsTo
     {
         return $this->belongsTo(Order::class);
     }
 
-    public function customer()
+    public function customer(): BelongsTo
     {
         return $this->belongsTo(Customer::class, 'customer_id');
     }
 
-    public function address()
+    public function address(): BelongsTo
     {
         return $this->belongsTo(CustomerAddress::class, 'invoice_address_id');
     }

app/Models/Shop/InvoicePayment.php

@@ -3,8 +3,10 @@
 namespace App\Models\Shop;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Venturecraft\Revisionable\RevisionableTrait;
 use Wildside\Userstamps\Userstamps;
+use Znck\Eloquent\Relations\BelongsToThrough;
 
 class InvoicePayment extends Model
 {
@@ -14,12 +16,12 @@ class InvoicePayment extends Model
 
     protected $table = 'shop_invoice_payments';
 
-    public function invoice()
+    public function invoice(): BelongsTo
     {
         return $this->belongsTo(Invoice::class);
     }
 
-    public function order()
+    public function order(): BelongsToThrough
     {
         return $this->belongsToThrough(Order::class, Invoice::class);
     }

app/Models/Shop/Merchandise.php

@@ -4,6 +4,9 @@ namespace App\Models\Shop;
 
 use App\Traits\Model\Imageable;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+use Illuminate\Database\Eloquent\Relations\MorphToMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Kirschbaum\PowerJoins\PowerJoins;
 use Rinvex\Tags\Traits\Taggable;
@@ -28,17 +31,17 @@ class Merchandise extends Model implements HasMedia
         'plus',
     ];
 
-    public function Articles()
+    public function Articles(): MorphMany
     {
         return $this->morphMany(Article::class, 'product');
     }
 
-    public function Producer()
+    public function Producer(): BelongsTo
     {
         return $this->belongsTo(Producer::class);
     }
 
-    public function tags()
+    public function tags(): MorphToMany
     {
         return $this->morphToMany(Tag::class, 'taggable');
     }

app/Models/Shop/Offer.php

@@ -4,7 +4,10 @@ namespace App\Models\Shop;
 
 use App\Traits\Model\HasComments;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 use Staudenmeir\EloquentHasManyDeep\HasRelationships;
+use Znck\Eloquent\Relations\BelongsToThrough as RelationsBelongsToThrough;
 use Znck\Eloquent\Traits\BelongsToThrough;
 
 class Offer extends Model
@@ -15,12 +18,12 @@ class Offer extends Model
 
     protected $table = 'shop_offers';
 
-    public function article()
+    public function article(): BelongsTo
     {
         return $this->belongsTo(Article::class);
     }
 
-    public function article_nature()
+    public function article_nature(): RelationsBelongsToThrough
     {
         return $this->belongsToThrough(ArticleNature::class, Article::class, null, '', [
             'App\Models\Shop\Article' => 'article_id',
@@ -33,7 +36,7 @@ class Offer extends Model
         return $this->article->categories();
     }
 
-    public function price_lists()
+    public function price_lists(): HasManyThrough
     {
         return $this->hasManyThrough(PriceList::class, Tariff::class, 'id', 'tariff_id', 'tariff_id', 'id');
     }
@@ -48,12 +51,12 @@ class Offer extends Model
         );
     }
 
-    public function tariff()
+    public function tariff(): BelongsTo
     {
         return $this->belongsTo(Tariff::class);
     }
 
-    public function variation()
+    public function variation(): BelongsTo
     {
         return $this->belongsTo(Variation::class);
     }

app/Models/Shop/Order.php

@@ -3,6 +3,9 @@
 namespace App\Models\Shop;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use LaracraftTech\LaravelDateScopes\DateScopes;
 use Venturecraft\Revisionable\RevisionableTrait;
@@ -19,32 +22,32 @@ class Order extends Model
 
     protected $keepRevisionOf = ['customer_address_id', 'delivery_id', 'payment_type', 'status'];
 
-    public function customer()
+    public function customer(): BelongsTo
     {
         return $this->belongsTo(Customer::class);
     }
 
-    public function delivery_address()
+    public function delivery_address(): BelongsTo
     {
         return $this->belongsTo(CustomerAddress::class, 'delivery_address_id');
     }
 
-    public function delivery()
+    public function delivery(): BelongsTo
     {
         return $this->belongsTo(Delivery::class);
     }
 
-    public function detail()
+    public function detail(): HasMany
     {
         return $this->hasMany(OrderDetail::class);
     }
 
-    public function invoice()
+    public function invoice(): HasOne
     {
         return $this->hasOne(Invoice::class);
     }
 
-    public function sale_channel()
+    public function sale_channel(): BelongsTo
     {
         return $this->belongsTo(SaleChannel::class);
     }

app/Models/Shop/OrderDetail.php

@@ -3,6 +3,7 @@
 namespace App\Models\Shop;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class OrderDetail extends Model
 {
@@ -10,12 +11,12 @@ class OrderDetail extends Model
 
     protected $table = 'shop_order_details';
 
-    public function order()
+    public function order(): BelongsTo
     {
         return $this->belongsTo(Order::class);
     }
 
-    public function offer()
+    public function offer(): BelongsTo
     {
         return $this->belongsTo(Offer::class);
     }

app/Models/Shop/Package.php

@@ -3,6 +3,9 @@
 namespace App\Models\Shop;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 
 class Package extends Model
 {
@@ -10,22 +13,22 @@ class Package extends Model
 
     protected $table = 'shop_packages';
 
-    public function article_family()
+    public function article_family(): BelongsTo
     {
         return $this->belongsTo(ArticleNature::class);
     }
 
-    public function unities()
+    public function unities(): HasMany
     {
         return $this->hasMany(Unity::class);
     }
 
-    public function variations()
+    public function variations(): HasMany
     {
         return $this->hasMany(Variation::class);
     }
 
-    public function offers()
+    public function offers(): HasManyThrough
     {
         return $this->hasManyThrough(Offer::class, Variation::class);
     }

app/Models/Shop/PriceList.php

@@ -4,6 +4,9 @@ namespace App\Models\Shop;
 
 use App\Traits\Model\HasComments;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 use Znck\Eloquent\Traits\BelongsToThrough;
 
 class PriceList extends Model
@@ -14,22 +17,22 @@ class PriceList extends Model
 
     protected $table = 'shop_price_lists';
 
-    public function tariff()
+    public function tariff(): BelongsTo
     {
         return $this->belongsTo(Tariff::class);
     }
 
-    public function offers()
+    public function offers(): HasManyThrough
     {
         return $this->hasManyThrough(Offer::class, Tariff::class, 'id', 'tariff_id', 'id', 'id');
     }
 
-    public function sale_channel()
+    public function sale_channel(): BelongsTo
     {
         return $this->belongsTo(SaleChannel::class);
     }
 
-    public function price_list_values()
+    public function price_list_values(): HasMany
     {
         return $this->hasMany(PriceListValue::class);
     }

app/Models/Shop/PriceListValue.php

@@ -3,8 +3,10 @@
 namespace App\Models\Shop;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Wildside\Userstamps\Userstamps;
+use Znck\Eloquent\Relations\BelongsToThrough as RelationsBelongsToThrough;
 use Znck\Eloquent\Traits\BelongsToThrough;
 
 class PriceListValue extends Model
@@ -15,12 +17,12 @@ class PriceListValue extends Model
 
     protected $table = 'shop_price_list_values';
 
-    public function price_list()
+    public function price_list(): BelongsTo
     {
         return $this->belongsTo(PriceList::class);
     }
 
-    public function tariff()
+    public function tariff(): RelationsBelongsToThrough
     {
         return $this->belongsToThrough(
             Tariff::class,
@@ -34,7 +36,7 @@ class PriceListValue extends Model
         );
     }
 
-    public function vat()
+    public function vat(): BelongsTo
     {
         return $this->belongsTo(Tax::class, 'tax_id');
     }

app/Models/Shop/Producer.php

@@ -4,6 +4,8 @@ namespace App\Models\Shop;
 
 use App\Traits\Model\Imageable;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\MorphToMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Kirschbaum\PowerJoins\PowerJoins;
 use Rinvex\Tags\Traits\Taggable;
@@ -23,12 +25,12 @@ class Producer extends Model implements HasMedia
 
     }
 
-    public function Merchandises()
+    public function Merchandises(): HasMany
     {
         return $this->hasMany(Merchandise::class);
     }
 
-    public function tags()
+    public function tags(): MorphToMany
     {
         return $this->morphToMany(Tag::class, 'taggable');
     }

app/Models/Shop/SaleChannel.php

@@ -3,6 +3,9 @@
 namespace App\Models\Shop;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 
 class SaleChannel extends Model
 {
@@ -10,27 +13,27 @@ class SaleChannel extends Model
 
     protected $table = 'shop_sale_channels';
 
-    public function customer_sale_channels()
+    public function customer_sale_channels(): HasMany
     {
         return $this->hasMany(CustomerSaleChannel::class);
     }
 
-    public function customers()
+    public function customers(): BelongsToMany
     {
         return $this->belongsToMany(Customer::class, CustomerSaleChannel::class)->wherePivotNull('deleted_at');
     }
 
-    public function deliveries()
+    public function deliveries(): HasMany
     {
         return $this->hasMany(Delivery::class);
     }
 
-    public function price_lists()
+    public function price_lists(): HasMany
     {
         return $this->hasMany(PriceList::class);
     }
 
-    public function tariffs()
+    public function tariffs(): HasManyThrough
     {
         return $this->hasManyThrough(Tariff::class, PriceList::class, 'sale_channel_id', 'id', 'id', 'tariff_id');
     }

app/Models/Shop/Shelve.php

@@ -3,6 +3,7 @@
 namespace App\Models\Shop;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Staudenmeir\EloquentHasManyDeep\HasRelationships;
 
 class Shelve extends Model
@@ -13,18 +14,8 @@ class Shelve extends Model
 
     protected $table = 'categories';
 
-    public function articles()
+    public function articles(): HasMany
     {
         return $this->hasMany(Article::class);
     }
-
-    public function prices()
-    {
-        return $this->hasMany(Price::class);
-    }
-
-    public function packages()
-    {
-        return $this->hasMany(Package::class);
-    }
 }

app/Models/Shop/Tag.php

@@ -4,6 +4,8 @@ namespace App\Models\Shop;
 
 use App\Models\Botanic\Specie;
 use App\Models\Botanic\Variety;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\MorphToMany;
 use Rinvex\Tags\Models\Tag as parentTag;
 
 class Tag extends parentTag
@@ -22,42 +24,42 @@ class Tag extends parentTag
     ];
 
     // TODO
-    public function offers()
+    public function offers(): MorphToMany
     {
         return $this->articles();
     }
 
-    public function articles()
+    public function articles(): MorphToMany
     {
         return $this->morphedByMany(Article::class, 'taggable');
     }
 
-    public function categories()
+    public function categories(): MorphToMany
     {
         return $this->morphedByMany(Category::class, 'taggable');
     }
 
-    public function tag_group()
+    public function tag_group(): BelongsTo
     {
         return $this->belongsTo(TagGroup::class);
     }
 
-    public function shelves()
+    public function shelves(): MorphToMany
     {
         return $this->morphedByMany(Shelve::class, 'taggable');
     }
 
-    public function species()
+    public function species(): MorphToMany
     {
         return $this->morphedByMany(Specie::class, 'taggable');
     }
 
-    public function varieties()
+    public function varieties(): MorphToMany
     {
         return $this->morphedByMany(Variety::class, 'taggable');
     }
 
-    public function merchandises()
+    public function merchandises(): MorphToMany
     {
         return $this->morphedByMany(Merchandise::class, 'taggable');
     }

app/Models/Shop/TagGroup.php

@@ -4,6 +4,8 @@ namespace App\Models\Shop;
 
 use Dyrynda\Database\Support\CascadeSoftDeletes;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class TagGroup extends Model
@@ -16,12 +18,12 @@ class TagGroup extends Model
 
     protected $cascadeDeletes = ['tags'];
 
-    public function tags()
+    public function tags(): HasMany
     {
         return $this->hasMany(Tag::class);
     }
 
-    public function article_family()
+    public function article_family(): BelongsTo
     {
         return $this->belongsTo(ArticleNature::class);
     }

app/Models/Shop/Tariff.php

@@ -4,6 +4,9 @@ namespace App\Models\Shop;
 
 use App\Traits\Model\HasComments;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 use Kirschbaum\PowerJoins\PowerJoins;
 use Staudenmeir\EloquentHasManyDeep\HasRelationships;
 
@@ -15,32 +18,32 @@ class Tariff extends Model
 
     protected $table = 'shop_tariffs';
 
-    public function offers()
+    public function offers(): HasMany
     {
         return $this->hasMany(Offer::class);
     }
 
-    public function sale_channel()
+    public function sale_channel(): BelongsTo
     {
         return $this->belongsTo(SaleChannel::class);
     }
 
-    public function sale_channels()
+    public function sale_channels(): HasManyThrough
     {
         return $this->HasManyThrough(SaleChannel::class, PriceList::class, 'id', 'id', 'id', 'sale_channel_id');
     }
 
-    public function tariff_unity()
+    public function tariff_unity(): BelongsTo
     {
         return $this->belongsTo(TariffUnity::class);
     }
 
-    public function price_lists()
+    public function price_lists(): HasMany
     {
         return $this->hasMany(PriceList::class);
     }
 
-    public function price_list_values()
+    public function price_list_values(): HasManyThrough
     {
         return $this->hasManyThrough(PriceListValue::class, PriceList::class);
     }

app/Models/Shop/Variation.php

@@ -4,6 +4,8 @@ namespace App\Models\Shop;
 
 use App\Traits\Model\HasComments;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class Variation extends Model
 {
@@ -13,17 +15,17 @@ class Variation extends Model
 
     protected $table = 'shop_variations';
 
-    public function package()
+    public function package(): BelongsTo
     {
         return $this->belongsTo(Package::class);
     }
 
-    public function unity()
+    public function unity(): BelongsTo
     {
         return $this->belongsTo(Unity::class);
     }
 
-    public function offers()
+    public function offers(): HasMany
     {
         return $this->hasMany(Offer::class);
     }