SW-9574 Refactored pseudo price conditions in Bare theme

jhit · May 28, 2015 · 5517a48 · 5517a48
1 parent daa6163
commit 5517a48
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/themes/Frontend/Bare/frontend/compare/col.tpl b/themes/Frontend/Bare/frontend/compare/col.tpl
@@ -53,7 +53,7 @@
                     <li class="list--entry entry--price">
                         {* Article pseudoprice *}
                         {block name='frontend_compare_price_pseudoprice'}
-                            {if $sArticle.pseudoprice}
+                            {if $sArticle.pseudoprice|isHigherPrice:$sArticle.price}
                                 <span class="price--pseudoprice">
                                     {s name="reducedPrice" namespace="frontend/listing/box_article"}{/s} {$sArticle.pseudoprice|currency}
                                     {s name="Star" namespace="frontend/listing/box_article"}{/s}<br />
@@ -63,7 +63,7 @@
 
                         {* Article normal or discount price *}
                         {block name='frontend_compare_price_normal'}
-                            <span class="price--normal{if $sArticle.pseudoprice} price--reduced{/if}">
+                            <span class="price--normal{if $sArticle.pseudoprice|isHigherPrice:$sArticle.price} price--reduced{/if}">
                                 {if $sArticle.priceStartingFrom}
                                     {s name="ComparePriceFrom"}{/s}
                                 {/if}

diff --git a/themes/Frontend/Bare/frontend/detail/data.tpl b/themes/Frontend/Bare/frontend/detail/data.tpl
@@ -35,7 +35,7 @@
 			{/if}
 		{else}
 
-			<div class="product--price price--default{if $sArticle.pseudoprice} price--discount{/if}">
+			<div class="product--price price--default{if $sArticle.pseudoprice|isHigherPrice:$sArticle.price} price--discount{/if}">
 
 				{* Default price *}
 				{block name='frontend_detail_data_price_configurator'}
@@ -59,7 +59,7 @@
 
                 {* Discount price *}
                 {block name='frontend_detail_data_pseudo_price'}
-                    {if $sArticle.pseudoprice}
+                    {if $sArticle.pseudoprice|isHigherPrice:$sArticle.price}
 
                         {block name='frontend_detail_data_pseudo_price_discount_icon'}
                             <span class="price--discount-icon">

diff --git a/themes/Frontend/Bare/frontend/listing/product-box/box-minimal.tpl b/themes/Frontend/Bare/frontend/listing/product-box/box-minimal.tpl
@@ -12,7 +12,7 @@
 
             {* Discount price *}
             {block name='frontend_listing_box_article_price_discount'}
-                {if $sArticle.pseudoprice}
+                {if $sArticle.pseudoprice|isHigherPrice:$sArticle.price}
                     <span class="price--discount is--nowrap">
                         {$sArticle.pseudoprice|currency}
                         {s name="Star"}{/s}
@@ -22,7 +22,7 @@
 
             {* Default price *}
             {block name='frontend_listing_box_article_price_default'}
-                <span class="price--default is--nowrap{if $sArticle.pseudoprice} is--discount{/if}">
+                <span class="price--default is--nowrap{if $sArticle.pseudoprice|isHigherPrice:$sArticle.price} is--discount{/if}">
                     {if $sArticle.priceStartingFrom && !$sArticle.liveshoppingData}{s name='ListingBoxArticleStartsAt'}{/s} {/if}
                     {$sArticle.price|currency}
                     {s name="Star"}{/s}

diff --git a/themes/Frontend/Bare/frontend/listing/product-box/product-badges.tpl b/themes/Frontend/Bare/frontend/listing/product-box/product-badges.tpl
@@ -6,7 +6,7 @@
 
 		{* Discount badge *}
 		{block name='frontend_listing_box_article_discount'}
-			{if $sArticle.pseudoprice}
+			{if $sArticle.pseudoprice|isHigherPrice:$sArticle.price}
 				<div class="product--badge badge--discount">
                     <i class="icon--percent2"></i>
                 </div>

diff --git a/themes/Frontend/Bare/frontend/listing/product-box/product-price.tpl b/themes/Frontend/Bare/frontend/listing/product-box/product-price.tpl
@@ -4,7 +4,7 @@
 
     {* Default price *}
     {block name='frontend_listing_box_article_price_default'}
-        <span class="price--default is--nowrap{if $sArticle.pseudoprice} is--discount{/if}">
+        <span class="price--default is--nowrap{if $sArticle.pseudoprice|isHigherPrice:$sArticle.price} is--discount{/if}">
             {if $sArticle.priceStartingFrom && !$sArticle.liveshoppingData}{s name='ListingBoxArticleStartsAt'}{/s} {/if}
             {$sArticle.price|currency}
             {s name="Star"}{/s}
@@ -13,7 +13,7 @@
 
     {* Discount price *}
     {block name='frontend_listing_box_article_price_discount'}
-        {if $sArticle.pseudoprice}
+        {if $sArticle.pseudoprice|isHigherPrice:$sArticle.price}
             <span class="price--discount is--nowrap">
                 {$sArticle.pseudoprice|currency}
                 {s name="Star"}{/s}

diff --git a/themes/Frontend/Bare/newsletter/alt/index.tpl b/themes/Frontend/Bare/newsletter/alt/index.tpl
@@ -21,7 +21,7 @@
 
 {$sArticle.description_long|truncate:50:"..."|strip_tags|trim}
 
-{if $sArticle.pseudoprice}
+{if $sArticle.pseudoprice|isHigherPrice:$sArticle.price}
 
 {s name="NewsletterIndexPseudoInsteadOf"}{/s}{$sArticle.pseudoprice|currency:use_shortname}
 {/if}
@@ -42,7 +42,7 @@
 
 {$sArticle.description_long|truncate:50:"..."|strip_tags|trim}
 
-{if $sArticle.pseudoprice}
+{if $sArticle.pseudoprice|isHigherPrice:$sArticle.price}
 
 {s name="NewsletterIndexPseudoInsteadOf"}{/s}{$sArticle.pseudoprice|currency:use_shortname}
 {/if}

diff --git a/themes/Frontend/Bare/newsletter/container/article.tpl b/themes/Frontend/Bare/newsletter/container/article.tpl
@@ -55,7 +55,7 @@
                                                         {/if}
                                                     </div>
                                                 {/if}
-                                                {if $sArticle.pseudoprice}
+                                                {if $sArticle.pseudoprice|isHigherPrice:$sArticle.price}
                                                     <span style="color:#999; font-size:13px; line-height:13px;"><s>{$sArticle.pseudoprice|currency} {s name="Star" namespace="frontend/listing/box_article"}{/s}</s></span>
                                                     <br/>
                                                     <strong style="color:#990000;font-size:14px;">