diff --git a/app/Http/Controllers/Bo/ProductsController.php b/app/Http/Controllers/Bo/ProductsController.php index 9574fa0d..bbd8a5d7 100644 --- a/app/Http/Controllers/Bo/ProductsController.php +++ b/app/Http/Controllers/Bo/ProductsController.php @@ -4,6 +4,7 @@ namespace App\Http\Controllers\Bo; use App\Http\Controllers\Controller; use App\Http\Requests\Bo\ProductRequest; +use App\Http\Requests\Bo\UpdateProductOrderRequest; use App\Models\OldSlug; use App\Models\FoodProduct; use App\Models\ToolProduct; @@ -18,6 +19,7 @@ use App\Traits\Controllers\ChangesModelOrder; use App\Traits\Controllers\UpdateModelStatus; use Illuminate\Database\Eloquent\Builder; use Illuminate\Http\Request; +use Illuminate\Support\Facades\DB; use Illuminate\Support\Str; use Illuminate\Support\Facades\File; @@ -867,4 +869,35 @@ class ProductsController extends Controller $products = Product::where('star', 1)->paginate(10); return view('bo.products.starred', compact('products')); } + + /** + * Update product order. + * + * @param UpdateProductOrderRequest $request + * @param Product $product + * @return void + */ + public function changeSelectedOrder(UpdateProductOrderRequest $request, Product $product) + { + // Laravel 8 style ... validated() never returns a string. + $validated = $request->validated(); + $newOrder = $validated['order']; + + return DB::transaction(function () use ($product, $newOrder) { + // Update all products who will be moved with this order update. + // Includes soft deleted to avoid problems if we restore them. + $request = Product::withTrashed() + ->where('id', '!=', $product->id) + ->whereBetween('order', [min($product->order, $newOrder), max($product->order, $newOrder)]); + $product->order < $newOrder ? $request->decrement('order', 1) : $request->increment('order', 1); + + // Update the product. + $product->order = $newOrder; + if (!$product->saveOrFail()) { + return back()->with('error', trans('crud.messages.order_not_changed')); + }; + + return redirect()->back()->with('success', trans('crud.messages.order_changed')); + }); + } } diff --git a/app/Http/Requests/Bo/UpdateProductOrderRequest.php b/app/Http/Requests/Bo/UpdateProductOrderRequest.php new file mode 100644 index 00000000..cc01750b --- /dev/null +++ b/app/Http/Requests/Bo/UpdateProductOrderRequest.php @@ -0,0 +1,57 @@ +check(); + } + + /** + * Prepare the data for validation. + * + * @return void + */ + protected function prepareForValidation(): void + { + $this->product = $this->route('product'); + $max = Product::query()->max('order'); + + $this->merge([ + 'order' => min($this->input('order'), $max) + ]); + } + + /** + * Get the validation rules that apply to the request. + * + * @return array + */ + public function rules(): array + { + return [ + 'order' => [ + 'required', + 'integer', + 'min:1', + function ($attribute, $value, $fail) { + if ($this->product && intval($value) === $this->product->order) { + $fail("La valeur de {$attribute} doit être différente de la valeur actuelle."); + } + }, + ], + ]; + } +} diff --git a/database/migrations/2026_02_25_102520_reorder_all_products.php b/database/migrations/2026_02_25_102520_reorder_all_products.php new file mode 100644 index 00000000..61653517 --- /dev/null +++ b/database/migrations/2026_02_25_102520_reorder_all_products.php @@ -0,0 +1,29 @@ +orderBy('order')->get(); + $order = 1; + foreach ($products as $product) { + $product->order = $order; + $product->saveOrFail(); + $order++; + } + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + // Nothing to revert. + } +}; diff --git a/resources/views/bo/modules/change-model-order-select.blade.php b/resources/views/bo/modules/change-model-order-select.blade.php new file mode 100644 index 00000000..acfd6a0d --- /dev/null +++ b/resources/views/bo/modules/change-model-order-select.blade.php @@ -0,0 +1,23 @@ + +
+ {{ $value ?? '' }} + + +
+ + diff --git a/resources/views/bo/products/index.blade.php b/resources/views/bo/products/index.blade.php index 04f40ee5..2ac8205a 100644 --- a/resources/views/bo/products/index.blade.php +++ b/resources/views/bo/products/index.blade.php @@ -71,7 +71,7 @@ - @foreach ($products as $product) + @foreach ($products as $key => $product) @if(count(Config::get('theme.enum_product_types'))>1) @@ -110,11 +110,9 @@ - @php $routeName = request()->route()->getName(); @endphp - @include('bo.modules.change-model-order', [ - 'routeName' => 'products', - 'models' => $products, - 'model' => $product + @include('bo.modules.change-model-order-select', [ + 'model' => $product, + 'value' => $key + 1 + ($products->currentPage() - 1) * $products->perPage(), ]) Éditer diff --git a/routes/web-bo.php b/routes/web-bo.php index b077f5ec..0ace7905 100644 --- a/routes/web-bo.php +++ b/routes/web-bo.php @@ -32,7 +32,11 @@ Route::name('auth.') Route::prefix('bo') ->name('bo.') - ->middleware(['auth', 'is-admin', 'admin-secure']) + ->middleware([ + 'auth', + 'is-admin', + 'admin-secure' + ]) ->group(function () { Route::get('/', [DashboardController::class, 'index'])->name('dashboard'); Route::match(['get', 'put'], '/content/{key}', [ContentController::class, 'manage']) @@ -71,6 +75,10 @@ Route::prefix('bo') ->name('products.change-published'); Route::get('/products/change-order/{product}/{direction}', [ProductsController::class, 'changeOrder']) ->where('direction', 'up|down')->name('products.change-order'); + Route::patch('/products/{product}/change-selected-order', [ + ProductsController::class, + 'changeSelectedOrder' + ])->name('product.change-selected-order'); // Slides. Route::resource('slides', SlidesController::class)->except(['show']); Route::resource('sliders', SlidersController::class)->except(['show']);