diff --git a/app/Http/Controllers/Bo/ProductsController.php b/app/Http/Controllers/Bo/ProductsController.php index eebea2f3..fbdc8c2f 100644 --- a/app/Http/Controllers/Bo/ProductsController.php +++ b/app/Http/Controllers/Bo/ProductsController.php @@ -101,6 +101,17 @@ class ProductsController extends Controller $product->save(); } + //ajout des infos additionnelles + $product_type = $request->product_type; + + if ($product_type !== null) { + $product->product_type = $product_type; + $product->save(); + $methodName = "save" . ucfirst($product_type); + $this->$methodName($request, $product->id); + } + + //additionnal product info (foodProduct) return redirect()->route('bo.products.index'); } @@ -111,17 +122,25 @@ class ProductsController extends Controller $product->additionnalProductInfo = $product->additionnalProductInfo($product->product_type); //above lines equivalent to : //$product = Product::with('additionnalProductInfo')->findOrFail($id); + + if ($product->additionnalProductInfo === null) { //n'existe pas on renseigne un vide - $foodProduct = new FoodProduct(); - $product->foodProduct = $foodProduct; + $product_type = $product->product_type; + $modelClass = 'App\Models\\' . ucfirst($product_type); + $product->$product_type = new $modelClass(); } + + $ranges = Range::all(); return view('bo.products.edit', compact('product', 'ranges')); } public function update(Request $request, $id) { + + $product = Product::findOrFail($id); + $name = $request->name; $description = $request->description; $picture = $request->picture; @@ -149,16 +168,6 @@ class ProductsController extends Controller 'reference' => 'required|max:255', ]); - //on ajoute les infos foodProduct - $product = Product::with('foodProduct')->findOrFail($id); - - if ($product->foodProduct === null) { - $foodProduct = new FoodProduct(); - $product->foodProduct->save($foodProduct); - } else { - $product->foodProduct->update(); - } - // Check si le slug existe déjà dans cette gamme de produits $slugExist = Product::where([ ['range_id', $rangeId], @@ -219,6 +228,14 @@ class ProductsController extends Controller $oldSlug->delete(); } + //ajout des infos additionnelles + $product_type = $request->product_type; + + if ($product_type !== null) { + $methodName = "save" . ucfirst($product_type); + $this->$methodName($request, $product->id); + } + return redirect()->route('bo.products.edit', $product->id)->with('success', 'Modifications enregistrés !'); } @@ -238,4 +255,102 @@ class ProductsController extends Controller $product->delete(); return redirect()->route('bo.products.index'); } + + public function saveFoodProduct(Request $request, $product_id) + { + $foodProduct = FoodProduct::firstOrNew([ + 'product_id' => $product_id, + ]); + + $foodProduct->no_art = $request->no_art; + $foodProduct->ingredients = $request->ingredients; + $foodProduct->preparation = $request->preparation; + $foodProduct->servings = $request->servings; + $foodProduct->allergens = $request->allergens; + $foodProduct->selling_argument = $request->selling_argument; + $foodProduct->nv_ref_weight_g = $request->nv_ref_weight_g; + $foodProduct->nv_kj = $request->nv_kj; + $foodProduct->nv_kcal = $request->nv_kcal; + $foodProduct->nv_fat_g = $request->nv_fat_g; + $foodProduct->nv_sat_fat_g = $request->nv_sat_fat_g; + $foodProduct->nv_carb_g = $request->nv_carb_g; + $foodProduct->nv_sugar_g = $request->nv_sugar_g; + $foodProduct->nv_fiber_g = $request->nv_fiber_g; + $foodProduct->nv_protein_g = $request->nv_protein_g; + $foodProduct->nv_salt_g = $request->nv_salt_g; + $foodProduct->nv_serving_size_g = $request->nv_serving_size_g; + $foodProduct->nv_serving_kj = $request->nv_serving_kj; + $foodProduct->nv_serving_kcal = $request->nv_serving_kcal; + $foodProduct->nv_serving_fat_g = $request->nv_serving_fat_g; + $foodProduct->nv_serving_sat_fat_g = $request->nv_serving_sat_fat_g; + $foodProduct->nv_serving_carb_g = $request->nv_serving_carb_g; + $foodProduct->nv_serving_sugar_g = $request->nv_serving_sugar_g; + $foodProduct->nv_serving_fiber_g = $request->nv_serving_fiber_g; + $foodProduct->nv_serving_protein_g = $request->nv_serving_protein_g; + $foodProduct->nv_serving_salt_g = $request->nv_serving_salt_g; + $foodProduct->nv_daily_energy = $request->nv_daily_energy; + $foodProduct->nv_daily_fat = $request->nv_daily_fat; + $foodProduct->nv_daily_sat_fat = $request->nv_daily_sat_fat; + $foodProduct->nv_daily_carb = $request->nv_daily_carb; + $foodProduct->nv_daily_sugar = $request->nv_daily_sugar; + $foodProduct->nv_daily_fiber = $request->nv_daily_fiber; + $foodProduct->nv_daily_protein = $request->nv_daily_protein; + $foodProduct->nv_daily_salt = $request->nv_daily_salt; + $foodProduct->nutriscore = $request->nutriscore; + $foodProduct->nutriscore_args = $request->nutriscore_args; + + $foodProduct->product_id = $product_id; + + + $foodProduct->save(); + + } + + public function storeFoodProduct(Request $request, $product_id) + { + $foodProduct = new FoodProduct(); + + $foodProduct->no_art = $request->no_art; + $foodProduct->ingredients = $request->ingredients; + $foodProduct->preparation = $request->preparation; + $foodProduct->servings = $request->servings; + $foodProduct->allergens = $request->allergens; + $foodProduct->selling_argument = $request->selling_argument; + $foodProduct->nv_ref_weight_g = $request->nv_ref_weight_g; + $foodProduct->nv_kj = $request->nv_kj; + $foodProduct->nv_kcal = $request->nv_kcal; + $foodProduct->nv_fat_g = $request->nv_fat_g; + $foodProduct->nv_sat_fat_g = $request->nv_sat_fat_g; + $foodProduct->nv_carb_g = $request->nv_carb_g; + $foodProduct->nv_sugar_g = $request->nv_sugar_g; + $foodProduct->nv_fiber_g = $request->nv_fiber_g; + $foodProduct->nv_protein_g = $request->nv_protein_g; + $foodProduct->nv_salt_g = $request->nv_salt_g; + $foodProduct->nv_serving_size_g = $request->nv_serving_size_g; + $foodProduct->nv_serving_kj = $request->nv_serving_kj; + $foodProduct->nv_serving_kcal = $request->nv_serving_kcal; + $foodProduct->nv_serving_fat_g = $request->nv_serving_fat_g; + $foodProduct->nv_serving_sat_fat_g = $request->nv_serving_sat_fat_g; + $foodProduct->nv_serving_carb_g = $request->nv_serving_carb_g; + $foodProduct->nv_serving_sugar_g = $request->nv_serving_sugar_g; + $foodProduct->nv_serving_fiber_g = $request->nv_serving_fiber_g; + $foodProduct->nv_serving_protein_g = $request->nv_serving_protein_g; + $foodProduct->nv_serving_salt_g = $request->nv_serving_salt_g; + $foodProduct->nv_daily_energy = $request->nv_daily_energy; + $foodProduct->nv_daily_fat = $request->nv_daily_fat; + $foodProduct->nv_daily_sat_fat = $request->nv_daily_sat_fat; + $foodProduct->nv_daily_carb = $request->nv_daily_carb; + $foodProduct->nv_daily_sugar = $request->nv_daily_sugar; + $foodProduct->nv_daily_fiber = $request->nv_daily_fiber; + $foodProduct->nv_daily_protein = $request->nv_daily_protein; + $foodProduct->nv_daily_salt = $request->nv_daily_salt; + $foodProduct->nutriscore = $request->nutriscore; + $foodProduct->nutriscore_args = $request->nutriscore_args; + + $foodProduct->product_id = $product_id; + + + $foodProduct->save(); + + } } diff --git a/app/Models/FoodProduct.php b/app/Models/FoodProduct.php index b2a2d1f9..dbb4485d 100644 --- a/app/Models/FoodProduct.php +++ b/app/Models/FoodProduct.php @@ -9,6 +9,15 @@ class FoodProduct extends Model { use HasFactory; + /** + * The attributes that are mass assignable. + * + * @var array + */ + protected $fillable = [ + 'product_id', + ]; + public function product() { return $this->belongsTo(Product::class); } diff --git a/database/migrations/2021_03_16_135155_create_food_products.php b/database/migrations/2021_03_16_135155_create_food_products.php index 9e1184d8..c2a875eb 100644 --- a/database/migrations/2021_03_16_135155_create_food_products.php +++ b/database/migrations/2021_03_16_135155_create_food_products.php @@ -25,7 +25,7 @@ class CreateFoodProducts extends Migration //autre info (venues de INCO) $table->text('ingredients')->nullable(); $table->text('preparation')->nullable(); - $table->unsignedInteger('servings')->default(1); + $table->unsignedInteger('servings')->nullable(); $table->text('allergens')->nullable(); $table->text('selling_argument')->nullable(); diff --git a/resources/views/bo/products/food_product.blade.php b/resources/views/bo/products/food_product.blade.php index fd1e0baa..f0753216 100644 --- a/resources/views/bo/products/food_product.blade.php +++ b/resources/views/bo/products/food_product.blade.php @@ -1,5 +1,6 @@