From 29ddec9e6243957318262a6764b753d379d721ef Mon Sep 17 00:00:00 2001
From: TheCoreDev <laurent@thecoredev.fr>
Date: Tue, 4 May 2021 12:36:03 +0200
Subject: [PATCH] =?UTF-8?q?On=20rajoute=20dans=20single-product=20l'origin?=
 =?UTF-8?q?e=20et=20on=20tient=20compte=20du=20fait=20qu'il=20peut=20y=20a?=
 =?UTF-8?q?voir=20plusieurs=20d=C3=A9clinaisons?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom/includes/single-product.html       | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/templates/frontOffice/custom/includes/single-product.html b/templates/frontOffice/custom/includes/single-product.html
index e63dad03..d92e5165 100644
--- a/templates/frontOffice/custom/includes/single-product.html
+++ b/templates/frontOffice/custom/includes/single-product.html
@@ -39,8 +39,8 @@
         </div>
 
         <div class="product-provenance col-sm-12">
-            <label class="label-provenance">{intl l="Provenance"}&nbsp;:&nbsp;</label>
-            <span class="texte-provenance">{if $_PROVENANCE ne ""}{$_PROVENANCE}{else}<i>{intl l="Non précisé"}</i>{/if}</span>
+            <label class="label-provenance">{intl l="Origine"}&nbsp;:&nbsp;</label>
+            <span class="texte-provenance">{if $_PROVENANCE ne ""}{$_PROVENANCE}{else}<i>{intl l="Non précisée"}</i>{/if}</span>
         </div>
 
         {* Stock *}
@@ -74,6 +74,7 @@
                                     <span class="price">{intl l="From %price" price={format_money number=$TAXED_PROMO_PRICE}}
                                     {loop name="attributes" type="attribute" product="$product_id" order="manual"}
                                         <span class="unite">{$TITLE}</span>
+                                        {if ($LOOP_TOTAL > 1) && ($LOOP_COUNT < $LOOP_TOTAL)}<span class="unite"> ou </span>{/if}
                                     {/loop}
                                     </span>
                                 </span>
@@ -89,11 +90,10 @@
                             {loop type="product_sale_elements" name="pse" default=1 product=$product_id}
                                 <span class="regular-price col-xs-6">
                                     <span itemprop="price" class="price" content="{$TAXED_PROMO_PRICE}">{format_money number=$TAXED_PROMO_PRICE}
-                                    {if $LOOP_COUNT = 1}
-                                        {loop name="attributes" type="attribute" product="$product_id" order="manual"}
-                                            <span class="unite">{$TITLE}</span>
-                                        {/loop}
-                                    {/if}
+                                    {loop name="attributes" type="attribute" product="$product_id" order="manual"}
+                                        <span class="unite">{$TITLE}</span>
+                                        {if ($LOOP_TOTAL > 1) && ($LOOP_COUNT < $LOOP_TOTAL)}<span class="unite"> ou </span>{/if}
+                                    {/loop}
                                     </span>
                                 </span>
                                 {if $SHOW_ORIGINAL_PRICE}
@@ -112,6 +112,7 @@
                                 <span class="regular-price col-xs-12"><span itemprop="price" class="price" content="{$TAXED_PRICE}">{intl l="From %price" price={format_money number=$TAXED_PRICE}}
                                 {loop name="attributes" type="attribute" product="$product_id" order="manual"}
                                     <span class="unite">{$TITLE}</span>
+                                    {if ($LOOP_TOTAL > 1) && ($LOOP_COUNT < $LOOP_TOTAL)}<span class="unite"> ou </span>{/if}
                                 {/loop}
                                 </span></span>
                             {/loop}
@@ -119,11 +120,10 @@
                         {elseloop rel="dp"}
                             {loop type="product_sale_elements" name="pse" default=1 product=$product_id}
                                 <span class="regular-price col-xs-12"><span itemprop="price" class="price" content="{$TAXED_PRICE}">{format_money number=$TAXED_PRICE}
-                                {if $LOOP_COUNT = 1}
-                                    {loop name="attributes" type="attribute" product="$product_id" order="manual"}
-                                        <span class="unite">{$TITLE}</span>
-                                    {/loop}
-                                {/if}
+                                {loop name="attributes" type="attribute" product="$product_id" order="manual"}
+                                    <span class="unite">{$TITLE}</span>
+                                    {if ($LOOP_TOTAL > 1) && ($LOOP_COUNT < $LOOP_TOTAL)}<span class="unite"> ou </span>{/if}
+                                {/loop}
                                 </span></span>
                             {/loop}
                         {/elseloop}