Fix on tarif with sale_channel
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<h1 style="font-size: 2em;">{{ $shelve['name'] }}</h1>
|
||||
</div>
|
||||
<div class="col-6 text-right">
|
||||
<a href="">Découvrir la sélection</a>
|
||||
<a href="{{ route('') }}">Découvrir la sélection</a>
|
||||
<a href="">Tout voir</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<nav class="navbar navbar-expand-lg navbar-light bg-light">
|
||||
<div class="collapse navbar-collapse" id="navbarSupportedContent">
|
||||
<ul class="navbar-nav mr-auto" style="width:180px;">
|
||||
<ul class="navbar-nav mr-auto">
|
||||
@foreach ($categories as $category)
|
||||
@if (isset($category['children']))
|
||||
<li class="nav-item dropdown">
|
||||
|
||||
Reference in New Issue
Block a user