diff --git a/app/Http/Controllers/Fo/ProductsController.php b/app/Http/Controllers/Fo/ProductsController.php index 2885fa1..8a8626f 100644 --- a/app/Http/Controllers/Fo/ProductsController.php +++ b/app/Http/Controllers/Fo/ProductsController.php @@ -62,7 +62,7 @@ class ProductsController extends Controller $productsQuery = !empty($search) ? $this->getProductQuery($search) : Product::query(); $productsQuery->with('subrange.range'); $productsQuery->where('published', true); - $productsQuery->orderBy('order', 'ASC'); + $productsQuery->orderBy('priority_order', 'ASC'); // * Range filter (obligatoire). $productsQuery->whereHas('subrange', function (Builder $q) use ($range) { @@ -85,7 +85,6 @@ class ProductsController extends Controller if ($request->vip) { $productsQuery->where('is_vip', $request->vip); } - return \response()->json(new ProductPaginatedCollectionResource($productsQuery->paginate(6))); } diff --git a/app/Http/Controllers/Fo/RecipesController.php b/app/Http/Controllers/Fo/RecipesController.php index 3461cb9..ac737c9 100644 --- a/app/Http/Controllers/Fo/RecipesController.php +++ b/app/Http/Controllers/Fo/RecipesController.php @@ -75,7 +75,7 @@ class RecipesController extends Controller ]) ); - $recipes = $query->orderBy('slug', 'ASC')->paginate(9); + $recipes = $query->orderBy('priority_order', 'ASC')->paginate(9); return view('fo.pages.ideas.recipes', compact( 'ranges', diff --git a/resources/views/bo/pages/advice/index.blade.php b/resources/views/bo/pages/advice/index.blade.php index 7c0f584..d6890e0 100644 --- a/resources/views/bo/pages/advice/index.blade.php +++ b/resources/views/bo/pages/advice/index.blade.php @@ -52,14 +52,6 @@ 'model' => $adviceModel, ]) {{ $adviceModel->updated_at }} - @if (empty(request()->search) && request()->range) - @php $routeName = request()->route()->getName(); @endphp - @include('bo.modules.change-model-order', [ - 'routeName' => 'advice', - 'models' => $adviceModels, - 'model' => $adviceModel, - ]) - @endif
diff --git a/resources/views/bo/pages/products/index.blade.php b/resources/views/bo/pages/products/index.blade.php index 013cc6b..ac2f17e 100644 --- a/resources/views/bo/pages/products/index.blade.php +++ b/resources/views/bo/pages/products/index.blade.php @@ -40,11 +40,6 @@ 'published' => __('validation.attributes.published'), 'updated_at' => __('validation.attributes.updated_at'), ]); - if (request()->range) { - $cols = array_merge($cols, [ - 'order' => Str::ucfirst(__('validation.attributes.order')) - ]); - } @endphp @include('bo.modules.table-col-sorter', [ 'cols' => $cols, @@ -69,16 +64,7 @@ 'model' => $productModel, ]) {{ $productModel->updated_at }} - @php - $routeName = request()->route()->getName(); - @endphp - @if (empty(request()->search) && request()->range) - @include('bo.modules.change-model-order', [ - 'routeName' => 'products', - 'models' => $productModels, - 'model' => $productModel, - ]) - @endif +