diff --git a/app/Http/Controllers/Fo/ProductController.php b/app/Http/Controllers/Fo/ProductController.php index a0ea614..ce9e867 100644 --- a/app/Http/Controllers/Fo/ProductController.php +++ b/app/Http/Controllers/Fo/ProductController.php @@ -28,7 +28,8 @@ class ProductController extends Controller ->where('published', true) ->inRandomOrder()->limit(2)->get(); $klubBloc = KlubBloc::query()->first(); - $rangeModels = Range::query()->whereNot('id', $productModel->range->id)->get()->random(2); + $rangeModels = Range::query()->whereNot('id', $productModel->range->id)->limit(2) + ->inRandomOrder()->get(); return view('fo.pages.products.show', compact( 'productModel', diff --git a/app/Http/Controllers/Fo/RangeController.php b/app/Http/Controllers/Fo/RangeController.php index 8ae5cce..e38e85b 100644 --- a/app/Http/Controllers/Fo/RangeController.php +++ b/app/Http/Controllers/Fo/RangeController.php @@ -33,7 +33,7 @@ class RangeController extends Controller public function show(string $slug): \Illuminate\Contracts\View\View { $rangeModel = Range::query()->where('slug', $slug)->firstOrFail(); - $rangeModels = Range::query()->where('slug', '!=', $slug)->get(); + $rangeModels = Range::query()->where('slug', '!=', $slug)->limit(2)->inRandomOrder()->get(); $productModels = Product::query()->where('range_id', $rangeModel->id) ->where('published', true) ->orderBy('order', 'asc') diff --git a/resources/views/fo/pages/products/show.blade.php b/resources/views/fo/pages/products/show.blade.php index 9ea3c79..5e3da11 100644 --- a/resources/views/fo/pages/products/show.blade.php +++ b/resources/views/fo/pages/products/show.blade.php @@ -233,39 +233,6 @@ {{-- LIKED TOO --}} - - - - - {{ __('Vous aimerez aussi...') }} - - - - - @foreach ($rangeModels as $key => $rangeModel) - - - - - - - {{ Str::limit(__($rangeModel->label), 30) }} - - - @endforeach - - - - - - + @include('fo.partials.liked-too', ['rangeModels' => $rangeModels]) @endsection diff --git a/resources/views/fo/pages/ranges/show.blade.php b/resources/views/fo/pages/ranges/show.blade.php index e8e4e63..9a5e9db 100644 --- a/resources/views/fo/pages/ranges/show.blade.php +++ b/resources/views/fo/pages/ranges/show.blade.php @@ -69,7 +69,9 @@ {{-- RANGES --}} - @include('fo.partials.ranges') + {{-- @include('fo.partials.ranges') --}} + {{-- LIKED TOO --}} + @include('fo.partials.liked-too', ['rangeModels' => $rangeModels]) {{-- ENGAGEMENTS --}} diff --git a/resources/views/fo/partials/liked-too.blade.php b/resources/views/fo/partials/liked-too.blade.php new file mode 100644 index 0000000..677a27e --- /dev/null +++ b/resources/views/fo/partials/liked-too.blade.php @@ -0,0 +1,34 @@ + + + + + {{ __('Vous aimerez aussi...') }} + + + + + @foreach ($rangeModels as $key => $rangeModel) + + + + + + + {{ Str::limit(__($rangeModel->label), 30) }} + + + @endforeach + + + + + +