dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #78 from montes/redution-typo

Browse Source 
[-] FO : Fixed variable typo (redution instead of reduction in some places)
This commit is contained in:
Vincent Augagneur
2012-12-12 00:53:00 -08:00
parent 98d9575c4c aa4b474522
commit 04ad50908e
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default/mobile/js/product.js
+1 -1
View File
@@ -64,7 +64,7 @@ var ProductFn = (function()
productShowPrice: '0', productShowPrice: '0',
productUnitPriceRatio: '', productUnitPriceRatio: '',
productPriceWithoutRedution: '', productPriceWithoutReduction: '',
productPrice: '', productPrice: '',
// Customizable field // Customizable field
themes/default/mobile/product-js.tpl
+3 -3
View File
@@ -74,13 +74,13 @@ function initProductPage()
{if !$priceDisplay || $priceDisplay == 2} {if !$priceDisplay || $priceDisplay == 2}
{assign var='productPrice' value=$product->getPrice(true, $smarty.const.NULL, 2)} {assign var='productPrice' value=$product->getPrice(true, $smarty.const.NULL, 2)}
{assign var='productPriceWithoutRedution' value=$product->getPriceWithoutReduct(false, $smarty.const.NULL)} {assign var='productPriceWithoutReduction' value=$product->getPriceWithoutReduct(false, $smarty.const.NULL)}
{elseif $priceDisplay == 1} {elseif $priceDisplay == 1}
{assign var='productPrice' value=$product->getPrice(false, $smarty.const.NULL, 2)} {assign var='productPrice' value=$product->getPrice(false, $smarty.const.NULL, 2)}
{assign var='productPriceWithoutRedution' value=$product->getPriceWithoutReduct(true, $smarty.const.NULL)} {assign var='productPriceWithoutReduction' value=$product->getPriceWithoutReduct(true, $smarty.const.NULL)}
{/if} {/if}
ProductFn.productPriceWithoutRedution = '{$productPriceWithoutRedution}'; ProductFn.productPriceWithoutReduction = '{$productPriceWithoutReduction}';
ProductFn.productPrice = '{$productPrice}'; ProductFn.productPrice = '{$productPrice}';
// Customizable field // Customizable field
themes/default/product.tpl
+8 -8
View File
@@ -74,13 +74,13 @@ var stock_management = {$stock_management|intval};
{/if} {/if}
{if !$priceDisplay || $priceDisplay == 2} {if !$priceDisplay || $priceDisplay == 2}
{assign var='productPrice' value=$product->getPrice(true, $smarty.const.NULL, $priceDisplayPrecision)} {assign var='productPrice' value=$product->getPrice(true, $smarty.const.NULL, $priceDisplayPrecision)}
{assign var='productPriceWithoutRedution' value=$product->getPriceWithoutReduct(false, $smarty.const.NULL)} {assign var='productPriceWithoutReduction' value=$product->getPriceWithoutReduct(false, $smarty.const.NULL)}
{elseif $priceDisplay == 1} {elseif $priceDisplay == 1}
{assign var='productPrice' value=$product->getPrice(false, $smarty.const.NULL, $priceDisplayPrecision)} {assign var='productPrice' value=$product->getPrice(false, $smarty.const.NULL, $priceDisplayPrecision)}
{assign var='productPriceWithoutRedution' value=$product->getPriceWithoutReduct(true, $smarty.const.NULL)} {assign var='productPriceWithoutReduction' value=$product->getPriceWithoutReduct(true, $smarty.const.NULL)}
{/if} {/if}
var productPriceWithoutRedution = '{$productPriceWithoutRedution}'; var productPriceWithoutReduction = '{$productPriceWithoutReduction}';
var productPrice = '{$productPrice}'; var productPrice = '{$productPrice}';
// Customizable field // Customizable field
@@ -370,10 +370,10 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
<div class="price"> <div class="price">
{if !$priceDisplay || $priceDisplay == 2} {if !$priceDisplay || $priceDisplay == 2}
{assign var='productPrice' value=$product->getPrice(true, $smarty.const.NULL, $priceDisplayPrecision)} {assign var='productPrice' value=$product->getPrice(true, $smarty.const.NULL, $priceDisplayPrecision)}
{assign var='productPriceWithoutRedution' value=$product->getPriceWithoutReduct(false, $smarty.const.NULL)} {assign var='productPriceWithoutReduction' value=$product->getPriceWithoutReduct(false, $smarty.const.NULL)}
{elseif $priceDisplay == 1} {elseif $priceDisplay == 1}
{assign var='productPrice' value=$product->getPrice(false, $smarty.const.NULL, $priceDisplayPrecision)} {assign var='productPrice' value=$product->getPrice(false, $smarty.const.NULL, $priceDisplayPrecision)}
{assign var='productPriceWithoutRedution' value=$product->getPriceWithoutReduct(true, $smarty.const.NULL)} {assign var='productPriceWithoutReduction' value=$product->getPriceWithoutReduct(true, $smarty.const.NULL)}
{/if} {/if}
<p class="our_price_display"> <p class="our_price_display">
@@ -388,7 +388,7 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
{if $product->on_sale} {if $product->on_sale}
<img src="{$img_dir}onsale_{$lang_iso}.gif" alt="{l s='On sale'}" class="on_sale_img"/> <img src="{$img_dir}onsale_{$lang_iso}.gif" alt="{l s='On sale'}" class="on_sale_img"/>
<span class="on_sale">{l s='On sale!'}</span> <span class="on_sale">{l s='On sale!'}</span>
{elseif $product->specificPrice AND $product->specificPrice.reduction AND $productPriceWithoutRedution > $productPrice} {elseif $product->specificPrice AND $product->specificPrice.reduction AND $productPriceWithoutReduction > $productPrice}
<span class="discount">{l s='Reduced price!'}</span> <span class="discount">{l s='Reduced price!'}</span>
{/if} {/if}
{if $priceDisplay == 2} {if $priceDisplay == 2}
@@ -401,8 +401,8 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
{if $product->specificPrice AND $product->specificPrice.reduction} {if $product->specificPrice AND $product->specificPrice.reduction}
<p id="old_price"><span class="bold"> <p id="old_price"><span class="bold">
{if $priceDisplay >= 0 && $priceDisplay <= 2} {if $priceDisplay >= 0 && $priceDisplay <= 2}
{if $productPriceWithoutRedution > $productPrice} {if $productPriceWithoutReduction > $productPrice}
<span id="old_price_display">{convertPrice price=$productPriceWithoutRedution}</span> <span id="old_price_display">{convertPrice price=$productPriceWithoutReduction}</span>
<!-- {if $tax_enabled && $display_tax_label == 1} <!-- {if $tax_enabled && $display_tax_label == 1}
{if $priceDisplay == 1}{l s='tax excl.'}{else}{l s='tax incl.'}{/if} {if $priceDisplay == 1}{l s='tax excl.'}{else}{l s='tax incl.'}{/if}
{/if} --> {/if} -->