diff --git a/app/Http/Resources/ProductResource.php b/app/Http/Resources/ProductResource.php index 9a32f4bb..0a6f8379 100644 --- a/app/Http/Resources/ProductResource.php +++ b/app/Http/Resources/ProductResource.php @@ -44,11 +44,16 @@ class ProductResource extends JsonResource { // @phpcs:enable $data = array_merge( - ['discountedPriceHt' => $this->product->discountedPriceHt], \array_intersect_key( $this->product->toArray(), self::$skeleton - ) + ), + ['discountedPriceHt' => $this->product->discountedPriceHt], + [ + 'nutriscore' => (isset($this->product->foodProduct->nutriscore)) ? + $this->product->foodProduct->nutriscore : + null + ] ); $data['description'] = clean($data['description']); diff --git a/resources/views/bo/products/food_product.blade.php b/resources/views/bo/products/food_product.blade.php index dbff993b..49c11890 100644 --- a/resources/views/bo/products/food_product.blade.php +++ b/resources/views/bo/products/food_product.blade.php @@ -219,7 +219,7 @@
- +
diff --git a/resources/views/front/sable/img/nutriscore/nutriscore-1.png b/resources/views/front/sable/img/nutriscore/nutriscore-A.png similarity index 100% rename from resources/views/front/sable/img/nutriscore/nutriscore-1.png rename to resources/views/front/sable/img/nutriscore/nutriscore-A.png diff --git a/resources/views/front/sable/img/nutriscore/nutriscore-2.png b/resources/views/front/sable/img/nutriscore/nutriscore-B.png similarity index 100% rename from resources/views/front/sable/img/nutriscore/nutriscore-2.png rename to resources/views/front/sable/img/nutriscore/nutriscore-B.png diff --git a/resources/views/front/sable/img/nutriscore/nutriscore-3.png b/resources/views/front/sable/img/nutriscore/nutriscore-C.png similarity index 100% rename from resources/views/front/sable/img/nutriscore/nutriscore-3.png rename to resources/views/front/sable/img/nutriscore/nutriscore-C.png diff --git a/resources/views/front/sable/img/nutriscore/nutriscore-4.png b/resources/views/front/sable/img/nutriscore/nutriscore-D.png similarity index 100% rename from resources/views/front/sable/img/nutriscore/nutriscore-4.png rename to resources/views/front/sable/img/nutriscore/nutriscore-D.png diff --git a/resources/views/front/sable/img/nutriscore/nutriscore-5.png b/resources/views/front/sable/img/nutriscore/nutriscore-E.png similarity index 100% rename from resources/views/front/sable/img/nutriscore/nutriscore-5.png rename to resources/views/front/sable/img/nutriscore/nutriscore-E.png diff --git a/resources/views/front/sable/js/components/FilterComponent.vue b/resources/views/front/sable/js/components/FilterComponent.vue index db400f02..52bf116e 100644 --- a/resources/views/front/sable/js/components/FilterComponent.vue +++ b/resources/views/front/sable/js/components/FilterComponent.vue @@ -120,7 +120,7 @@

Tous les rayons

-
+
@@ -139,37 +139,39 @@
-
-
-

- bientôt disponible -

- -
-
-
- {{ product.name }} -
-

-
- {{ product.price }}€ - {{ product.discountedPriceHt }}€ +
+
+
+

+ bientôt disponible +

+
-
- - +
+
+ {{ product.name }} +
+

+
+ {{ product.price }}€ + {{ product.discountedPriceHt }}€ +
+
+ + +
+
-
-
+