antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ticket-eanUpgrade' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-09-20 14:55:24 +02:00
commit a8086dcfdc
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
themes/site/product.tpl
View File

@ -430,6 +430,9 @@ var oneQuantityAvailableSentence = '{l s='Warning: 1 item in stock!' js=1}';
{if $product->description_more}
<div id="more_description_content" class="rte align_justify">{$product->description_more}</div>
{/if}
{if $product->description_comment}
<div id="more_description_content" class="rte align_justify">{$product->description_comment}</div>
{/if}
</div>
</div>
{if isset($colors) && $colors}

21
themes/site_mobile/product.tpl
View File

@ -252,7 +252,7 @@ var oneQuantityAvailableSentence = '{l s='Warning: 1 item in stock!' js=1}';
{if $product->specificPrice AND $product->specificPrice.reduction}
<p id="old_price">
<span>
{l s='Instead of'}
{l s='Instead of'}
{if $priceDisplay >= 0 && $priceDisplay <= 2}
{if $productPriceWithoutRedution > $productPrice}
<span id="old_price_display">{convertPrice price=$productPriceWithoutRedution}
@ -310,9 +310,9 @@ var oneQuantityAvailableSentence = '{l s='Warning: 1 item in stock!' js=1}';
{foreach from=$groups key=id_attribute_group item=group}
{if $group.attributes|@count}
<p>
<label for="group_{$id_attribute_group|intval}">{$group.name|escape:'htmlall':'UTF-8'}
<label for="group_{$id_attribute_group|intval}">{$group.name|escape:'htmlall':'UTF-8'}
{if $id_attribute_group == '795' ||
{if $id_attribute_group == '795' ||
$id_attribute_group == '75'}
<span class="help_tailles tailles">&nbsp;</span>
{/if}
@ -354,10 +354,10 @@ var oneQuantityAvailableSentence = '{l s='Warning: 1 item in stock!' js=1}';
<p id="quantity_wanted_p"{if (!$allow_oosp && $product->quantity <= 0) OR $virtual OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if}>
<label>{l s='Quantity'} :</label>
<input type="text" name="qty" id="quantity_wanted" class="text" value="{if isset($quantityBackup)}{$quantityBackup|intval}{else}{if $product->minimal_quantity > 1}{$product->minimal_quantity}{else}1{/if}{/if}" size="2" maxlength="3" {if $product->minimal_quantity > 1}onkeyup="checkMinimalQuantity({$product->minimal_quantity});"{/if} />
<div class="action_quantity">
<span class="upQuantity">+</span>
<span class="downQuantity">-</span>
<span class="downQuantity">-</span>
</div>
</p>
@ -436,14 +436,14 @@ var oneQuantityAvailableSentence = '{l s='Warning: 1 item in stock!' js=1}';
{/if}*}
</div>
{/if}
{if $HOOK_EXTRA_RIGHT}{$HOOK_EXTRA_RIGHT}{/if}
<!-- description and features -->
{if $product->description_more || $product->videos || $product->description_short || $product->description || $features || $accessories || $HOOK_PRODUCT_TAB || $attachments}
{if $product->description_more || $product->description_comment || $product->videos || $product->description_short || $product->description || $features || $accessories || $HOOK_PRODUCT_TAB || $attachments}
<div id="more_info_block" class="clear">
<ul id="more_info_tabs" class="idTabs idTabsShort">
@ -464,6 +464,9 @@ var oneQuantityAvailableSentence = '{l s='Warning: 1 item in stock!' js=1}';
{if $product->description_more}
<div>{$product->description_more}</div>
{/if}
{if $product->description_comment}
<div>{$product->description_comment}</div>
{/if}
<div>{$product->description_short}</div>
</div>
{/if}
@ -543,7 +546,7 @@ var oneQuantityAvailableSentence = '{l s='Warning: 1 item in stock!' js=1}';
</a>
</div>
{/if}
</div>
</div>
@ -663,7 +666,7 @@ var oneQuantityAvailableSentence = '{l s='Warning: 1 item in stock!' js=1}';
var actual_quantity = $('#quantity_wanted').val();
if($(this).hasClass('upQuantity')) {
var new_quantity = parseInt(actual_quantity) + 1;
var new_quantity = parseInt(actual_quantity) + 1;
} else if($(this).hasClass('downQuantity')) {
var new_quantity = parseInt(actual_quantity) - 1;
if(new_quantity == 0) {