From bd1e41ed6aae688527310a6b1510a1ad452dafd1 Mon Sep 17 00:00:00 2001
From: TheCoreDev <laurent@thecoredev.fr>
Date: Mon, 19 Apr 2021 17:09:30 +0200
Subject: [PATCH] =?UTF-8?q?Toujours=20sur=20int=C3=A9gration=20des=20prix?=
 =?UTF-8?q?=20d=C3=A9gressifs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/frontOffice/custom/cart.html        | 12 +++
 .../custom/includes/addedToCart.html          | 75 +++++++++++++++++++
 .../custom/includes/single-product.html       |  2 +-
 templates/frontOffice/custom/product.html     | 25 +++++--
 4 files changed, 105 insertions(+), 9 deletions(-)
 create mode 100644 templates/frontOffice/custom/includes/addedToCart.html

diff --git a/templates/frontOffice/custom/cart.html b/templates/frontOffice/custom/cart.html
index 382f77be..c342c766 100644
--- a/templates/frontOffice/custom/cart.html
+++ b/templates/frontOffice/custom/cart.html
@@ -105,10 +105,22 @@
                                 <a href="{token_url path="/cart/delete/%item_id" item_id=$ITEM_ID success_url={url path='/cart'}}" class="btn btn-link"><i class="fa fa-trash"></i> {intl l="Remove"}</a>
                             </td>
                             <td class="unitprice">
+                            {ifloop rel="dp"}
+                                {loop type="digressive" name="dp" product_id=$PRODUCT_ID quantity=$QUANTITY}
+                                {if $IS_PROMO == 1}
+                                <div class="special-price"><span class="price">{format_money number=$TAXED_PROMO_PRICE}</span></div>
+                                <small class="old-price">{intl l="instead of"} <span class="price">{format_money number=$TAXED_PRICE}</span></small>
+                                {else}
+                                <div class="special-price"><span class="price">{format_money number=$TAXED_PRICE}</span></div>
+                                {/if}
+                                {/loop}
+                            {/ifloop}
+                            {elseloop rel="dp"}
                                 <div class="special-price"><span class="price">{format_money number=$REAL_TAXED_PRICE}</span></div>
                                 {if $IS_PROMO == 1}
                                     <small class="old-price">{intl l="instead of"} <span class="price">{format_money number=$TAXED_PRICE}</span></small>
                                 {/if}
+                           {/elseloop}
                             </td>
                             <td class="qty">
                                 <div class="form-group group-qty">
diff --git a/templates/frontOffice/custom/includes/addedToCart.html b/templates/frontOffice/custom/includes/addedToCart.html
new file mode 100644
index 00000000..08115d39
--- /dev/null
+++ b/templates/frontOffice/custom/includes/addedToCart.html
@@ -0,0 +1,75 @@
+{* This page should not replace the current previous URL *}
+{set_previous_url ignore_current="1"}
+
+{default_translation_domain domain='fo.custom'}
+{loop type="product" name="add_product_to_cart" id={product attr="id"}}
+<div class="clearfix">
+    <table>
+        <tr>
+            <td colspan="3">
+                <h3 class="text-center">{intl l="The product has been added to your cart" }</h3>
+            </td>
+        </tr>
+        <tr>
+            <td class="col-md-4">
+                {ifloop rel="pse-first-image"}
+                    {loop type="product-sale-elements-image" name="pse-first-image" product_sale_elements_id={$smarty.get.pse_id} limit="1"}
+                        {loop type="image" name="product-image" id=$PRODUCT_IMAGE_ID product=$ID limit="1" width="218" height="146" resize_mode="borders"}
+                            <img itemprop="image" src="{$IMAGE_URL nofilter}" alt="Product #{$LOOP_COUNT}">
+                        {/loop}
+                    {/loop}
+                {/ifloop}
+                {elseloop rel="pse-first-image"}
+                    {loop type="image" name="product-image" product=$ID limit="1" width="218" height="146" resize_mode="borders"}
+                        <img itemprop="image" src="{$IMAGE_URL nofilter}" alt="Product #{$LOOP_COUNT}">
+                    {/loop}
+                {/elseloop}
+            </td>
+            <td class="col-md-4">
+                <h2>{$TITLE}</h2>
+                {loop type="attribute_combination" name="product_options" product_sale_elements={$smarty.get.pse_id} order="manual"}
+                    <p>{$ATTRIBUTE_TITLE} : {$ATTRIBUTE_AVAILABILITY_TITLE}</p>
+                {/loop}
+            </td>
+            <td class="col-md-4">
+                {ifloop rel="dp"}
+                    {loop type="digressive" name="dp" product_id={product attr="id"} limit=1}
+                        {if $IS_PROMO == 1}
+                        <div class="special-price"><span class="price">{format_money number=$TAXED_PROMO_PRICE}{intl l="unite"}</span></div>
+                        <small class="old-price"> <span class="price">{format_money number=$TAXED_PRICE}</span></small>
+                        {else}
+                        <div class="special-price"><span class="price">{format_money number=$TAXED_PRICE}{intl l="unite"}</span></div>
+                        {/if}
+                    {/loop}
+                {/ifloop}
+                {elseloop rel="dp"}
+                    {loop type="product_sale_elements" name="product_price" id={$smarty.get.pse_id}}
+                        {if $IS_PROMO == 1}
+                            <div class="special-price"><span class="price">{format_money number=$TAXED_PROMO_PRICE} {intl l="unite"}</span></div>
+                            <small class="old-price"> <span class="price">{format_money number=$TAXED_PRICE}</span></small>
+                        {else}
+                            <div class="special-price"><span class="price">{format_money number=$TAXED_PRICE} {intl l="unite"}</span></div>
+                        {/if}
+                    {/loop}
+                {/elseloop}
+            </td>
+        </tr>
+    </table>
+    <a href="{url path="/cart"}" role="button" class="btn btn-primary pull-right"><i class="fa fa-shopping-cart"></i> {intl l="View Cart"}</a>
+    <button type="button" class="btn btn-default pull-right" data-dismiss="modal"><i class="fa fa-chevron-right"></i> {intl l="Continue Shopping"}</button>
+</div>
+{ifloop rel="accessories"}
+    <aside id="products-upsell" class="grid" role="complementary" aria-labelledby="products-upsell-label">
+        <div class="products-heading">
+            <h3 id="products-upsell-label">{intl l="Upsell Products"}</h3>
+        </div>
+        <div class="products-content">
+            <ul class="list-unstyled row products-grid">
+                {loop type="accessory" name="accessories" product="$ID" order="random" limit="3"}
+                    {include file="includes/single-product.html" product_id=$ACCESSORY_ID hasBtn=false hasDescription=false width="218" height="146"}
+                {/loop}
+            </ul>
+        </div>
+    </aside><!-- #products-upsell -->
+{/ifloop}
+{/loop}
diff --git a/templates/frontOffice/custom/includes/single-product.html b/templates/frontOffice/custom/includes/single-product.html
index 34af936b..8378a1df 100644
--- a/templates/frontOffice/custom/includes/single-product.html
+++ b/templates/frontOffice/custom/includes/single-product.html
@@ -64,7 +64,7 @@
                             {if $SHOW_ORIGINAL_PRICE}
                             <span class="old-price col-xs-6">
                                 <span class="price-label">{intl l="Regular Price:"} </span>
-                                <span class="price">{format_money number=$TAXED_PRICE}</span>
+                                <span class="price">{intl l="From %price" price={format_money number=$TAXED_PRICE}}</span>
                             </span>
                             {/if}
                         {/loop}
diff --git a/templates/frontOffice/custom/product.html b/templates/frontOffice/custom/product.html
index 57a9bcf7..5b9a32d8 100644
--- a/templates/frontOffice/custom/product.html
+++ b/templates/frontOffice/custom/product.html
@@ -210,19 +210,28 @@
                             <span class="special-price">
                                 {ifloop rel="dp"}
                                     {loop type="digressive" name="dp" product_id=$product_id quantity=1}
-                                    <span class="price-label">{intl l="Special Price:"} </span><span id="pse-price" class="price">
-                                    {if $IS_PROMO}
-                                    {format_money number=$TAXED_PROMO_PRICE symbol={currency attr="symbol"}}
-                                    {else}
-                                    {format_money number=$TAXED_PRICE symbol={currency attr="symbol"}}
-                                    {/if}
-                                    </span>
+                                        <span class="price-label">{intl l="Special Price:"} </span><span id="pse-price" class="price">
+                                        {if $IS_PROMO}
+                                           {format_money number=$TAXED_PROMO_PRICE symbol={currency attr="symbol"}}
+                                        {else}
+                                          {format_money number=$TAXED_PRICE symbol={currency attr="symbol"}}
+                                        {/if}
+                                        {intl l="unite"}
+                                        </span>
                                     {/loop}
                                 {/ifloop}
                                 {elseloop rel="dp"}
+                                <span id="pse-promo">
+                                    <span class="special-price"><span class="price-label">{intl l="Special Price:"} </span><span id="pse-price" class="price">{format_money number=$TAXED_PROMO_PRICE symbol={currency attr="symbol"}}</span></span>
+                                    <meta itemprop="price" content="{if $IS_PROMO}{$TAXED_PROMO_PRICE}{else}{$TAXED_PRICE}{/if}">
+
+                                    {if $SHOW_ORIGINAL_PRICE}
+                                        <span class="old-price"><span class="price-label">{intl l="Regular Price:"} </span><span id="pse-price-old" class="price">{format_money number=$TAXED_PRICE}</span></span>
+                                    {/if}
+                                </span>
                                 {/elseloop}
                             </span>
-                            <meta itemprop="price" content="{if $IS_PROMO}{$TAXED_PROMO_PRICE}{else}{$TAXED_PRICE} le kilo{/if}">
+                            <meta itemprop="price" content="{if $IS_PROMO}{$TAXED_PROMO_PRICE}{else}{$TAXED_PRICE}{/if}">
 
                             {if $SHOW_ORIGINAL_PRICE}
                                 <span class="old-price"><span class="price-label">{intl l="Regular Price:"} </span><span id="pse-price-old" class="price">{format_money number=$TAXED_PRICE}</span></span>