diff --git a/app/Models/Shop/Tariff.php b/app/Models/Shop/Tariff.php index f611994e..17484c86 100644 --- a/app/Models/Shop/Tariff.php +++ b/app/Models/Shop/Tariff.php @@ -53,7 +53,14 @@ class Tariff extends Model ->orWhere($this->table . '.code', 'LIKE', "${str}%"); } - public function scopeBySaleChanelDefault($query, $id) + public function scopeBySaleChannel($query, $id) + { + return $query->active()->whereHas('price_lists', function ($query) use ($id) { + $query->bySaleChannel($id); + }); + } + + public function scopeBySaleChannelDefault($query, $id) { return $query->where($this->table . '.sale_channel_id', $id); } diff --git a/app/Repositories/Shop/Articles.php b/app/Repositories/Shop/Articles.php index 850669e4..6bb7506e 100644 --- a/app/Repositories/Shop/Articles.php +++ b/app/Repositories/Shop/Articles.php @@ -196,24 +196,21 @@ class Articles $tags = $options['tags'] ?? false; $model = ($options['homepage'] ?? false) ? Article::homepage()->visible() : Article::visible(); - dump($model->with([ - 'offers' => function($query) use ($sale_channel_id) { - $query->withPriceListValuesBySaleChannel($sale_channel_id); - }, - ]) - ->get()->toArray()); - dump('ici'); - // exit; return $model->byCategory($category_id)->byTags($tags)->withAvailableOffers($sale_channel_id)->with([ 'image', 'product', 'article_nature', - 'offers' => function($query) use ($sale_channel_id) { + 'offers' => function ($query) use ($sale_channel_id) { $query->bySaleChannel($sale_channel_id); }, + 'offers.tariff' => function ($query) use ($sale_channel_id) { + $query->bySaleChannel($sale_channel_id); + }, + 'offers.tariff.price_lists' => function ($query) use ($sale_channel_id) { + $query->where('sale_channel_id', $sale_channel_id); + }, 'offers.variation.package', - 'offers.tariff.price_lists.price_list_values', ])->get(); } diff --git a/resources/views/Shop/Homepage/partials/sliderByShelve.blade.php b/resources/views/Shop/Homepage/partials/sliderByShelve.blade.php index 7508f65a..388247dd 100644 --- a/resources/views/Shop/Homepage/partials/sliderByShelve.blade.php +++ b/resources/views/Shop/Homepage/partials/sliderByShelve.blade.php @@ -5,7 +5,7 @@

{{ $shelve['name'] }}

- Découvrir la sélection + Découvrir la sélection Tout voir
diff --git a/resources/views/Shop/layout/partials/sections.blade.php b/resources/views/Shop/layout/partials/sections.blade.php index 16ff7175..663c128f 100644 --- a/resources/views/Shop/layout/partials/sections.blade.php +++ b/resources/views/Shop/layout/partials/sections.blade.php @@ -1,6 +1,6 @@