From b2eb3a4bc48a1d807e91619aee7464fde1e7f0d3 Mon Sep 17 00:00:00 2001 From: Olivier Legat Date: Mon, 19 Apr 2021 16:05:12 +0200 Subject: [PATCH] edition code article inco au create champs optionnels produit --- .../Controllers/Bo/ProductsController.php | 23 +++++++++---- ...ange_optional_fields_in_products_table.php | 33 +++++++++++++++++++ resources/views/bo/products/create.blade.php | 12 +++---- resources/views/bo/products/edit.blade.php | 12 +++---- .../views/bo/products/food_product.blade.php | 2 +- 5 files changed, 62 insertions(+), 20 deletions(-) create mode 100644 database/migrations/2021_04_19_155920_change_optional_fields_in_products_table.php diff --git a/app/Http/Controllers/Bo/ProductsController.php b/app/Http/Controllers/Bo/ProductsController.php index 9adba566..e75bf6ba 100644 --- a/app/Http/Controllers/Bo/ProductsController.php +++ b/app/Http/Controllers/Bo/ProductsController.php @@ -52,6 +52,9 @@ class ProductsController extends Controller $priceBuy = $request->price_buy; $stock = $request->stock; $reference = $request->reference; + $sell_unit = $request->sell_unit; + $weight = $request->weight; + $weight_unit = $request->weight_unit; $status = $request->status === null ? 0 : 1; $star = $request->star === null ? 0 : 1; $slug = Str::slug($name); @@ -64,9 +67,6 @@ class ProductsController extends Controller config('theme.product_image_maxwidth') . ',max_height=' . config('theme.product_image_maxheight'), 'price' => 'required|min:0|numeric', - 'price_buy' => 'required|min:0|numeric', - 'stock' => 'required|min:0|numeric', - 'reference' => 'required|max:255', ]); // Check si le slug existe déjà dans cette gamme de produits @@ -89,6 +89,9 @@ class ProductsController extends Controller $product->price_buy = $priceBuy; $product->stock = $stock; $product->reference = $reference; + $product->sell_unit = $sell_unit; + $product->weight = $weight; + $product->weight_unit = $weight_unit; $product->slug = $slug; $product->status = $status; $product->star = $star; @@ -182,6 +185,9 @@ class ProductsController extends Controller $priceBuy = $request->price_buy; $stock = $request->stock; $reference = $request->reference; + $sell_unit = $request->sell_unit; + $weight = $request->weight; + $weight_unit = $request->weight_unit; $status = $request->status === null ? 0 : 1; $star = $request->star === null ? 0 : 1; $slug = Str::slug($name); @@ -198,9 +204,6 @@ class ProductsController extends Controller config('theme.product_image_large_maxwidth') . ',max-height=' . config('theme.product_image_large_maxheight'), 'price' => 'required|min:0|numeric', - 'price_buy' => 'required|min:0|numeric', - 'stock' => 'required|min:0|numeric', - 'reference' => 'required|max:255', ]); // Check si le slug existe déjà dans cette gamme de produits @@ -254,6 +257,9 @@ class ProductsController extends Controller $product->price_buy = $priceBuy; $product->stock = $stock; $product->reference = $reference; + $product->sell_unit = $sell_unit; + $product->weight = $weight; + $product->weight_unit = $weight_unit; $product->slug = $slug; $product->status = $status; $product->star = $star; @@ -350,7 +356,9 @@ class ProductsController extends Controller 'product_id' => $product_id, ]); - //$foodProduct->no_art = $request->no_art; + if(!empty($request->no_art)) { + $foodProduct->no_art = $request->no_art; + } $foodProduct->ingredients = $request->ingredients; $foodProduct->preparation = $request->preparation; $foodProduct->servings = $request->servings; @@ -395,6 +403,7 @@ class ProductsController extends Controller } /** + * @deprecated * helper method to create additionnal product info * foodProduct */ diff --git a/database/migrations/2021_04_19_155920_change_optional_fields_in_products_table.php b/database/migrations/2021_04_19_155920_change_optional_fields_in_products_table.php new file mode 100644 index 00000000..b67f84c5 --- /dev/null +++ b/database/migrations/2021_04_19_155920_change_optional_fields_in_products_table.php @@ -0,0 +1,33 @@ +unsignedBigInteger('stock')->nullable()->change(); + $table->string('reference')->nullable()->change(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('products', function (Blueprint $table) { + // + }); + } +} diff --git a/resources/views/bo/products/create.blade.php b/resources/views/bo/products/create.blade.php index 822829ca..9299c587 100644 --- a/resources/views/bo/products/create.blade.php +++ b/resources/views/bo/products/create.blade.php @@ -40,16 +40,16 @@
- - + +
- - + +
- - + +
diff --git a/resources/views/bo/products/edit.blade.php b/resources/views/bo/products/edit.blade.php index f23b821e..77878bb3 100644 --- a/resources/views/bo/products/edit.blade.php +++ b/resources/views/bo/products/edit.blade.php @@ -64,16 +64,16 @@
- - + +
- - + +
- - + +
diff --git a/resources/views/bo/products/food_product.blade.php b/resources/views/bo/products/food_product.blade.php index 5f9c5389..7f110dd1 100644 --- a/resources/views/bo/products/food_product.blade.php +++ b/resources/views/bo/products/food_product.blade.php @@ -6,7 +6,7 @@
- + id)) disabled @endif>