Fix on tarif with sale_channel

This commit is contained in:
Ludovic CANDELLIER
2022-03-30 15:46:10 +02:00
parent 2d86f162a0
commit 081df4d5d0
4 changed files with 17 additions and 13 deletions

View File

@@ -53,7 +53,14 @@ class Tariff extends Model
->orWhere($this->table . '.code', 'LIKE', "${str}%"); ->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); return $query->where($this->table . '.sale_channel_id', $id);
} }

View File

@@ -196,14 +196,6 @@ class Articles
$tags = $options['tags'] ?? false; $tags = $options['tags'] ?? false;
$model = ($options['homepage'] ?? false) ? Article::homepage()->visible() : Article::visible(); $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; // exit;
return $model->byCategory($category_id)->byTags($tags)->withAvailableOffers($sale_channel_id)->with([ return $model->byCategory($category_id)->byTags($tags)->withAvailableOffers($sale_channel_id)->with([
'image', 'image',
@@ -212,8 +204,13 @@ class Articles
'offers' => function ($query) use ($sale_channel_id) { 'offers' => function ($query) use ($sale_channel_id) {
$query->bySaleChannel($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.variation.package',
'offers.tariff.price_lists.price_list_values',
])->get(); ])->get();
} }

View File

@@ -5,7 +5,7 @@
<h1 style="font-size: 2em;">{{ $shelve['name'] }}</h1> <h1 style="font-size: 2em;">{{ $shelve['name'] }}</h1>
</div> </div>
<div class="col-6 text-right"> <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> <a href="">Tout voir</a>
</div> </div>
</div> </div>

View File

@@ -1,6 +1,6 @@
<nav class="navbar navbar-expand-lg navbar-light bg-light"> <nav class="navbar navbar-expand-lg navbar-light bg-light">
<div class="collapse navbar-collapse" id="navbarSupportedContent"> <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) @foreach ($categories as $category)
@if (isset($category['children'])) @if (isset($category['children']))
<li class="nav-item dropdown"> <li class="nav-item dropdown">