Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 7 additions & 18 deletions server/src/Models/Product.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
use Fleetbase\Traits\HasPublicid;
use Fleetbase\Traits\HasUuid;
use Fleetbase\Traits\Searchable;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Support\Arr;
use Illuminate\Support\Str;
use Milon\Barcode\Facades\DNS2DFacade as DNS2D;
Expand Down Expand Up @@ -170,18 +171,12 @@ public function category()
return $this->setConnection(config('fleetbase.connection.db'))->belongsTo(Category::class);
}

/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function addonCategories()
public function addonCategories(): HasMany
{
return $this->hasMany(ProductAddonCategory::class);
}

/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function variants()
public function variants(): HasMany
{
return $this->hasMany(ProductVariant::class);
}
Expand All @@ -194,34 +189,28 @@ public function primaryImage()
return $this->setConnection(config('fleetbase.connection.db'))->belongsTo(File::class);
}

/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function files()
public function files(): HasMany
{
return $this->setConnection(config('fleetbase.connection.db'))->hasMany(File::class, 'subject_uuid');
}

/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
* @return HasMany
*/
public function reviews()
{
return $this->hasMany(Review::class, 'subject_uuid');
}

/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
* @return HasMany
*/
public function votes()
{
return $this->hasMany(Vote::class, 'subject_uuid');
}

/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function hours()
public function hours(): HasMany
{
return $this->hasMany(ProductHour::class);
}
Expand Down
8 changes: 3 additions & 5 deletions server/src/Models/ProductAddonCategory.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
use Fleetbase\Casts\Json;
use Fleetbase\Traits\HasApiModelBehavior;
use Fleetbase\Traits\HasUuid;
use Illuminate\Database\Eloquent\Relations\BelongsTo;

class ProductAddonCategory extends StorefrontModel
{
Expand Down Expand Up @@ -62,16 +63,13 @@ class ProductAddonCategory extends StorefrontModel
*/
protected $hidden = ['product'];

/**
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/
public function category()
public function category(): BelongsTo
{
return $this->setConnection(config('fleetbase.connection.db'))->belongsTo(AddonCategory::class)->with(['addons']);
}

/**
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
* @return BelongsTo
*/
public function product()
{
Expand Down
6 changes: 2 additions & 4 deletions server/src/Models/ProductVariant.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
use Fleetbase\Traits\HasMetaAttributes;
use Fleetbase\Traits\HasPublicid;
use Fleetbase\Traits\HasUuid;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Spatie\Sluggable\HasSlug;
use Spatie\Sluggable\SlugOptions;

Expand Down Expand Up @@ -119,10 +120,7 @@ public function product()
return $this->belongsTo(Product::class);
}

/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function options()
public function options(): HasMany
{
return $this->hasMany(ProductVariantOption::class);
}
Expand Down
5 changes: 3 additions & 2 deletions server/src/Models/Store.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
use Fleetbase\Traits\HasPublicid;
use Fleetbase\Traits\HasUuid;
use Fleetbase\Traits\Searchable;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Support\Carbon;
use Spatie\Sluggable\HasSlug;
use Spatie\Sluggable\SlugOptions;
Expand Down Expand Up @@ -282,7 +283,7 @@ public function networkStores()
}

/**
* @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
* @return BelongsToMany
*/
/**
* Catalog assignments pointing at this store.
Expand Down Expand Up @@ -316,7 +317,7 @@ public function scopeActiveInNetwork($query, ?string $networkUuid)
return $query->whereHas('networks', fn ($networkQuery) => $networkQuery->where('network_uuid', $networkUuid)->where('network_stores.status', NetworkStore::STATUS_ACTIVE));
}

public function networks()
public function networks(): BelongsToMany
{
return $this->belongsToMany(Network::class, 'network_stores', 'store_uuid', 'network_uuid')
->using(NetworkStore::class)
Expand Down
6 changes: 2 additions & 4 deletions server/src/Models/StoreLocation.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
use Fleetbase\Traits\HasApiModelBehavior;
use Fleetbase\Traits\HasPublicid;
use Fleetbase\Traits\HasUuid;
use Illuminate\Database\Eloquent\Relations\HasMany;

class StoreLocation extends StorefrontModel
{
Expand Down Expand Up @@ -102,10 +103,7 @@ public function store()
return $this->belongsTo(Store::class);
}

/**
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/
public function hours()
public function hours(): HasMany
{
return $this->hasMany(StoreHour::class);
}
Expand Down