diff --git a/app/Http/Controllers/Bo/ProductsController.php b/app/Http/Controllers/Bo/ProductsController.php index 988ce145..d77037e3 100644 --- a/app/Http/Controllers/Bo/ProductsController.php +++ b/app/Http/Controllers/Bo/ProductsController.php @@ -14,6 +14,7 @@ use App\Models\Range; use App\Models\Tag; use App\Models\TaxRate; use App\Models\XmlInco; +use App\Traits\Controllers\ChangesModelOrder; use App\Traits\Controllers\UpdateModelStatus; use Illuminate\Http\Request; use Illuminate\Support\Str; @@ -22,6 +23,7 @@ use Illuminate\Support\Facades\File; class ProductsController extends Controller { use UpdateModelStatus; + use ChangesModelOrder; /** * Display a listing of the resource. @@ -48,7 +50,7 @@ class ProductsController extends Controller if (!empty($filter_brand)) { $products = $products->where('brand', $filter_brand); } - $products = $products->paginate(10); + $products = $products->orderBy('order', 'ASC')->paginate(10); // Ici récupération des infos additionnelles pour affichage dans la liste. foreach ($products as &$product) { diff --git a/app/Http/Controllers/ProductsController.php b/app/Http/Controllers/ProductsController.php index da3d183c..854bf962 100644 --- a/app/Http/Controllers/ProductsController.php +++ b/app/Http/Controllers/ProductsController.php @@ -111,7 +111,7 @@ class ProductsController extends Controller $productsQuery = $this->buildFilterQuery($sessionFilter); /** @var \Illuminate\Database\Eloquent\Collection<\App\Models\Product> */ - $products = $productsQuery->paginate(6); + $products = $productsQuery->orderBy('order', 'ASC')->paginate(6); if ($request->ajax()) { return \response()->json([ProductResource::collection($products), $products->total()]); diff --git a/app/Http/Requests/Bo/UpdateChangeOrderRequest.php b/app/Http/Requests/Bo/UpdateChangeOrderRequest.php new file mode 100644 index 00000000..b88283e4 --- /dev/null +++ b/app/Http/Requests/Bo/UpdateChangeOrderRequest.php @@ -0,0 +1,42 @@ +check(); + } + + /** + * Prepare the data for validation. + * + * @return void + */ + protected function prepareForValidation(): void + { + $this->merge([ + 'direction' => $this->direction === 'up' ? true : false + ]); + } + + /** + * Get the validation rules that apply to the request. + * + * @return array + */ + public function rules(): array + { + return [ + 'direction' => 'required|boolean', + ]; + } +} diff --git a/app/Traits/Controllers/ChangesModelOrder.php b/app/Traits/Controllers/ChangesModelOrder.php new file mode 100644 index 00000000..374bf7bc --- /dev/null +++ b/app/Traits/Controllers/ChangesModelOrder.php @@ -0,0 +1,55 @@ +route()->parameterNames); + $className = Str::ucfirst(Str::lower($params->get($params->count() - 2))); + $className = "\\App\\Models\\$className"; + + if (!class_exists($className)) { + throw new \RuntimeException("The $className class doesn't exist."); + } + + /** @var \Illuminate\Database\Eloquent\Model|null */ + $model = $className::where('id', $model->id)->first(); + + if (!$model) { + return redirect()->back()->with('error', trans('crud.messages.order_not_changed')); + } + + return DB::transaction(function () use ($request, $className, $model) { + /** @var \Illuminate\Database\Eloquent\Model|null */ + $tmp = $className::where('order', $request->direction ? '<' : '>', $model->order) + ->orderBy('order', $request->direction ? 'DESC' : 'ASC')->first(); + + if (!$tmp) { + return redirect()->back()->with('error', trans('crud.messages.order_not_changed')); + } + + $newOrder = $tmp->order; + $tmp->order = $model->order; + $model->order = $newOrder; + $tmp->saveOrFail(); + $model->saveOrFail(); + + return redirect()->back()->with('success', trans('crud.messages.order_changed')); + }); + } +} diff --git a/database/migrations/2023_07_26_091913_add_order_products_table.php b/database/migrations/2023_07_26_091913_add_order_products_table.php new file mode 100644 index 00000000..0c5524ab --- /dev/null +++ b/database/migrations/2023_07_26_091913_add_order_products_table.php @@ -0,0 +1,39 @@ +integer('order')->default(1)->after('margin')->comment('Ordonnancement du produit.'); + }); + + $allProducts = Product::all(); + foreach ($allProducts as $key => $product) { + $product->order = ($key + 1); + $product->saveOrFail(); + } + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('products', function (Blueprint $table) { + $table->dropColumn('order'); + }); + } +} diff --git a/resources/lang/fr/crud.php b/resources/lang/fr/crud.php new file mode 100644 index 00000000..60fde920 --- /dev/null +++ b/resources/lang/fr/crud.php @@ -0,0 +1,14 @@ + [ + 'order_changed' => 'L\'ordre a été changé !', + 'order_not_changed' => 'L\'ordre n\'a pas été changé !', + ], + + 'other' => [ + 'up' => 'Modifier l\'ordre d\'apparition vers le haut', + 'down' => 'Modifier l\'ordre d\'apparition vers le bas', + 'right' => 'Vous n\'avez pas les droits', + ] +]; diff --git a/resources/views/bo/modules/change-model-order.blade.php b/resources/views/bo/modules/change-model-order.blade.php new file mode 100644 index 00000000..f0d6289f --- /dev/null +++ b/resources/views/bo/modules/change-model-order.blade.php @@ -0,0 +1,22 @@ +
| Type | + @endif +Ref Externe | +Image | +Nom | +Marque | +Prix en € | +Stock | +Référence | +Gamme | +Publié | +Ordre | ++ + + @foreach ($products as $product) + |
|---|---|---|---|---|---|---|---|---|---|---|
| + {{ Config::get('theme.enum_product_types')[$product->product_type] }} + | + @endif ++ @if($product->product_type == "foodProduct") + {{ $product->foodProduct->no_art }} + @endif + | +
+ @if ($product->picture !== null)
+
+ |
+ {{ $product->name }} | +{{ $product->brand->label ?? '' }} | +{{ number_format($product->price, 2, ',', ' ') }}€ | +{{ number_format($product->stock, 0, ',', ' ') }} | +{{ $product->reference }} | +{{ $product->range->name }} | +
+ |
+ @php $routeName = request()->route()->getName(); @endphp
+ @include('bo.modules.change-model-order', [
+ 'routeName' => 'products',
+ 'models' => $products,
+ 'model' => $product
+ ])
+
+ Éditer
+ |
+