diff --git a/app/Http/Controllers/Bo/ProductsController.php b/app/Http/Controllers/Bo/ProductsController.php index edfb55b5..449a128b 100644 --- a/app/Http/Controllers/Bo/ProductsController.php +++ b/app/Http/Controllers/Bo/ProductsController.php @@ -5,6 +5,9 @@ namespace App\Http\Controllers\Bo; use App\Http\Controllers\Controller; use App\Models\OldSlug; use App\Models\FoodProduct; +use App\Models\ToolProduct; +use App\Models\AnifoodProduct; +use App\Models\GarmentProduct; use App\Models\Product; use App\Models\Range; use App\Models\Tag; @@ -466,55 +469,42 @@ class ProductsController extends Controller } /** - * @deprecated - * helper method to create additionnal product info - * foodProduct + * helper method to update additionnal product info + * toolProduct */ - public function storeFoodProduct(Request $request, $product_id) + public function saveToolProduct(Request $request, $product_id) { - $foodProduct = new FoodProduct(); + $toolProduct = ToolProduct::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; + $toolProduct->save(); + } - $foodProduct->product_id = $product_id; + /** + * helper method to update additionnal product info + * anifoodProduct + */ + public function saveAnifoodProduct(Request $request, $product_id) + { + $anifoodProduct = AnifoodProduct::firstOrNew([ + 'product_id' => $product_id, + ]); + $anifoodProduct->save(); + } - $foodProduct->save(); + /** + * helper method to update additionnal product info + * garmentProduct + */ + public function saveGarmentProduct(Request $request, $product_id) + { + $garmentProduct = GarmentProduct::firstOrNew([ + 'product_id' => $product_id, + ]); + + $garmentProduct->save(); } /** diff --git a/app/Models/AnifoodProduct.php b/app/Models/AnifoodProduct.php new file mode 100644 index 00000000..c9f14c68 --- /dev/null +++ b/app/Models/AnifoodProduct.php @@ -0,0 +1,10 @@ +belongsTo(Product::class); + } +} diff --git a/app/Models/ToolProduct.php b/app/Models/ToolProduct.php new file mode 100644 index 00000000..7f8ebbb4 --- /dev/null +++ b/app/Models/ToolProduct.php @@ -0,0 +1,10 @@ +id(); + + //liaison à la table produits + $table->foreignId('product_id')->constrained('products'); + + //longeur, largeur, puissance, usage, conseils? + + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('tool_products'); + } +} diff --git a/database/migrations/2021_05_06_121546_create_anifood_products_table.php b/database/migrations/2021_05_06_121546_create_anifood_products_table.php new file mode 100644 index 00000000..b42543b0 --- /dev/null +++ b/database/migrations/2021_05_06_121546_create_anifood_products_table.php @@ -0,0 +1,38 @@ +id(); + + //liaison à la table produits + $table->foreignId('product_id')->constrained('products'); + + //compostions, portions, ? + + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('anifood_products'); + } +} diff --git a/database/migrations/2021_05_06_121656_create_garment_products_table.php b/database/migrations/2021_05_06_121656_create_garment_products_table.php new file mode 100644 index 00000000..cfc1915a --- /dev/null +++ b/database/migrations/2021_05_06_121656_create_garment_products_table.php @@ -0,0 +1,38 @@ +id(); + + //liaison à la table produits + $table->foreignId('product_id')->constrained('products'); + + //taille, couleur, matière ? + + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('garment_products'); + } +} diff --git a/resources/views/bo/products/anifood_product.blade.php b/resources/views/bo/products/anifood_product.blade.php new file mode 100644 index 00000000..b216b240 --- /dev/null +++ b/resources/views/bo/products/anifood_product.blade.php @@ -0,0 +1,5 @@ +