From 79a4e573cb50e7c478a455951b749ba113a6da6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Mon, 23 Oct 2023 11:58:02 +0200 Subject: [PATCH 1/6] Closes #28 Product.show banner is dynamic --- app/Http/Controllers/Fo/ProductsController.php | 3 ++- resources/views/fo/pages/products/product.blade.php | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/Fo/ProductsController.php b/app/Http/Controllers/Fo/ProductsController.php index f043744..430d3ef 100644 --- a/app/Http/Controllers/Fo/ProductsController.php +++ b/app/Http/Controllers/Fo/ProductsController.php @@ -35,7 +35,7 @@ class ProductsController extends Controller $q->where('id', $publishedRange->id); }) ->where('status', true) - ->paginate(9); + ->paginate(9); return view('fo.pages.products.range-products', [ 'products' => $products, @@ -51,6 +51,7 @@ class ProductsController extends Controller */ public function show(Product $publishedProduct) { + $publishedProduct->load('range'); $certifications = $publishedProduct->certifications()->where('status', true)->get(); $associatedRecipes = $publishedProduct->recipes()->where('status', true)->take(3)->get(); $productModel = $publishedProduct; diff --git a/resources/views/fo/pages/products/product.blade.php b/resources/views/fo/pages/products/product.blade.php index c5fc877..df1d43b 100644 --- a/resources/views/fo/pages/products/product.blade.php +++ b/resources/views/fo/pages/products/product.blade.php @@ -13,8 +13,8 @@
- Une assiette de merguez de volailles accompagnées de tomates cerise coupées, d'oigons tranchés et de persil + {{ $productModel->range->banner_alt }}
From 56e3583d19b3c7210fdc2aee56f6b1d7fe25aaf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Mon, 23 Oct 2023 12:11:09 +0200 Subject: [PATCH 4/6] Closes #25 Products description can be empty --- app/Http/Requests/Bo/Products/StoreProductRequest.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Http/Requests/Bo/Products/StoreProductRequest.php b/app/Http/Requests/Bo/Products/StoreProductRequest.php index 0012096..1727f14 100644 --- a/app/Http/Requests/Bo/Products/StoreProductRequest.php +++ b/app/Http/Requests/Bo/Products/StoreProductRequest.php @@ -7,6 +7,7 @@ use App\Enums\NutriscoreEnum; use App\Traits\Requests\HasPicture; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Rules\Enum; +use Illuminate\Support\Str; class StoreProductRequest extends FormRequest { @@ -38,6 +39,7 @@ class StoreProductRequest extends FormRequest 'recipe_list' => \collect($this->recipes)->map(function ($value) { return \is_array($value) ? ($value['value'] ?? null) : null; })->filter()->all(), + 'description' => (string)Str::of($this->post('description')) ]); $this->mergePicture('picture'); $this->mergePicture('sticker'); @@ -60,7 +62,7 @@ class StoreProductRequest extends FormRequest 'sticker_alt' => 'required|min:3|max:255', 'sticker_title' => 'required|min:3|max:255', - 'description' => 'required|string|min:15', + 'description' => 'required|string', 'preparation' => 'nullable|string|min:15', 'ingredients' => 'required|string|min:15', From 1bb2a3fe618a48dc3bc0a7f5b114ef646ceb1e7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Mon, 23 Oct 2023 12:13:28 +0200 Subject: [PATCH 5/6] Closes #24 Header menu wording change --- resources/views/fo/layouts/header.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/fo/layouts/header.blade.php b/resources/views/fo/layouts/header.blade.php index 0183a4b..a22fb1b 100644 --- a/resources/views/fo/layouts/header.blade.php +++ b/resources/views/fo/layouts/header.blade.php @@ -40,7 +40,7 @@ Route::current()->getName() == 'ranges.products' || Route::current()->getName() == 'products.show') active @endif">