Merge branch 'tiket-productTemplate' into develop
This commit is contained in:
Marion Muszynski
commit
02fe6acca8
@ -5823,6 +5823,13 @@ a.loyalty-transform, .history_method span.total-discount-loyalty{
|
||||
#primary_block #image-block {
|
||||
float: left;
|
||||
}
|
||||
#product .coeur {
|
||||
left: -33px;
|
||||
position: absolute;
|
||||
top: 55px;
|
||||
cursor: pointer;
|
||||
z-index: 2;
|
||||
}
|
||||
#product #views_block {
|
||||
border: none;
|
||||
border-top: 0;
|
||||
@ -5855,6 +5862,9 @@ a.loyalty-transform, .history_method span.total-discount-loyalty{
|
||||
height: 420px;
|
||||
overflow: hidden;
|
||||
}
|
||||
#views_block #thumbs_list ul {
|
||||
padding: 0px;
|
||||
}
|
||||
#views_block #thumbs_list ul li{
|
||||
margin-bottom: 6px;
|
||||
height: 100px;
|
||||
@ -5871,7 +5881,7 @@ a.loyalty-transform, .history_method span.total-discount-loyalty{
|
||||
box-sizing: border-box;
|
||||
}
|
||||
#thumbs_list li:first-child{
|
||||
margin-top: 15px;
|
||||
/* margin-top: 15px; */
|
||||
}
|
||||
#product #views_block ul {
|
||||
overflow: initial;
|
||||
@ -5911,6 +5921,16 @@ a.loyalty-transform, .history_method span.total-discount-loyalty{
|
||||
width: 100%;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
div.two-part-form{
|
||||
display: block;
|
||||
position: relative;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
div.two-part-form:after{
|
||||
display: block;
|
||||
content: '';
|
||||
clear: both;
|
||||
}
|
||||
div.form-left{
|
||||
float: left;
|
||||
padding-top: 30px;
|
||||
@ -5931,6 +5951,7 @@ div.form-right{
|
||||
|
||||
#product div#attributes {
|
||||
float: left;
|
||||
margin-right: 5px;
|
||||
}
|
||||
#product #buy_block #attributes p {
|
||||
margin-bottom: 10px;
|
||||
@ -5943,6 +5964,7 @@ div.form-right{
|
||||
#product #add_to_cart{
|
||||
padding:0;
|
||||
padding-top: 10px;
|
||||
text-align: right;
|
||||
}
|
||||
#product #short_description_block #short_description_content {
|
||||
width: 100%;
|
||||
|
||||
@ -239,112 +239,113 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
|
||||
<input type="hidden" name="add" value="1" />
|
||||
<input type="hidden" name="id_product_attribute" id="idCombination" value="" />
|
||||
</p>
|
||||
|
||||
<div class="form-left">
|
||||
{if isset($product->specificPrice) && $product->specificPrice.reduction_type == "percentage"}
|
||||
<span class="reduction_product">- {$product->specificPrice.reduction|number_format:2 * 100}%</span>
|
||||
{/if}
|
||||
<!-- prices -->
|
||||
{if $product->show_price AND !isset($restricted_country_mode) AND !$PS_CATALOG_MODE}
|
||||
<p class="price">
|
||||
{if !$priceDisplay || $priceDisplay == 2}
|
||||
{assign var='productPrice' value=$product->getPrice(true, $smarty.const.NULL, 2)}
|
||||
{assign var='productPriceWithoutRedution' value=$product->getPriceWithoutReduct(false, $smarty.const.NULL)}
|
||||
{elseif $priceDisplay == 1}
|
||||
{assign var='productPrice' value=$product->getPrice(false, $smarty.const.NULL, 2)}
|
||||
{assign var='productPriceWithoutRedution' value=$product->getPriceWithoutReduct(true, $smarty.const.NULL)}
|
||||
{/if}
|
||||
{if $product->on_sale}
|
||||
<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>
|
||||
{*{elseif $product->specificPrice AND $product->specificPrice.reduction AND $productPriceWithoutRedution > $productPrice}
|
||||
<span class="discount">{l s='Reduced price!'}</span>*}
|
||||
{/if}
|
||||
<span class="our_price_display">
|
||||
{if $priceDisplay >= 0 && $priceDisplay <= 2}
|
||||
<span id="our_price_display">{convertPrice price=$productPrice}</span>
|
||||
{if $tax_enabled && ((isset($display_tax_label) && $display_tax_label == 1) OR !isset($display_tax_label))}
|
||||
{if $priceDisplay == 1}{l s='tax excl.'}{else}{l s='tax incl.'}{/if}
|
||||
{/if}
|
||||
{/if}
|
||||
</span>
|
||||
{if $priceDisplay == 2}
|
||||
<span id="pretaxe_price"><span id="pretaxe_price_display">{convertPrice price=$product->getPrice(false, $smarty.const.NULL, 2)}</span> {l s='tax excl.'}</span>
|
||||
{/if}
|
||||
</p>
|
||||
{if $product->specificPrice AND $product->specificPrice.reduction}
|
||||
<p id="old_price"><span class="bold">
|
||||
{if $priceDisplay >= 0 && $priceDisplay <= 2}
|
||||
{if $productPriceWithoutRedution > $productPrice}
|
||||
<span id="old_price_display">{convertPrice price=$productPriceWithoutRedution}</span>
|
||||
{if $tax_enabled && $display_tax_label == 1}
|
||||
<div class='two-part-form'>
|
||||
<div class="form-left">
|
||||
{if isset($product->specificPrice) && $product->specificPrice.reduction_type == "percentage"}
|
||||
<span class="reduction_product">- {$product->specificPrice.reduction|number_format:2 * 100}%</span>
|
||||
{/if}
|
||||
<!-- prices -->
|
||||
{if $product->show_price AND !isset($restricted_country_mode) AND !$PS_CATALOG_MODE}
|
||||
<p class="price">
|
||||
{if !$priceDisplay || $priceDisplay == 2}
|
||||
{assign var='productPrice' value=$product->getPrice(true, $smarty.const.NULL, 2)}
|
||||
{assign var='productPriceWithoutRedution' value=$product->getPriceWithoutReduct(false, $smarty.const.NULL)}
|
||||
{elseif $priceDisplay == 1}
|
||||
{assign var='productPrice' value=$product->getPrice(false, $smarty.const.NULL, 2)}
|
||||
{assign var='productPriceWithoutRedution' value=$product->getPriceWithoutReduct(true, $smarty.const.NULL)}
|
||||
{/if}
|
||||
{if $product->on_sale}
|
||||
<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>
|
||||
{*{elseif $product->specificPrice AND $product->specificPrice.reduction AND $productPriceWithoutRedution > $productPrice}
|
||||
<span class="discount">{l s='Reduced price!'}</span>*}
|
||||
{/if}
|
||||
<span class="our_price_display">
|
||||
{if $priceDisplay >= 0 && $priceDisplay <= 2}
|
||||
<span id="our_price_display">{convertPrice price=$productPrice}</span>
|
||||
{if $tax_enabled && ((isset($display_tax_label) && $display_tax_label == 1) OR !isset($display_tax_label))}
|
||||
{if $priceDisplay == 1}{l s='tax excl.'}{else}{l s='tax incl.'}{/if}
|
||||
{/if}
|
||||
{/if}
|
||||
{/if}
|
||||
</span>
|
||||
</p>
|
||||
|
||||
{/if}
|
||||
{*{if $product->specificPrice AND $product->specificPrice.reduction_type == 'percentage'}
|
||||
<p id="reduction_percent">{l s='(price reduced by'} <span id="reduction_percent_display">{$product->specificPrice.reduction*100}</span> %{l s=')'}</p>
|
||||
{/if}*}
|
||||
{if $packItems|@count}
|
||||
<p class="pack_price">{l s='instead of'} <span style="text-decoration: line-through;">{convertPrice price=$product->getNoPackPrice()}</span></p>
|
||||
<br class="clear" />
|
||||
{/if}
|
||||
{if $product->ecotax != 0}
|
||||
<p class="price-ecotax">{l s='include'} <span id="ecotax_price_display">{if $priceDisplay == 2}{$ecotax_tax_exc|convertAndFormatPrice}{else}{$ecotax_tax_inc|convertAndFormatPrice}{/if}</span> {l s='for green tax'}
|
||||
{if $product->specificPrice AND $product->specificPrice.reduction}
|
||||
<br />{l s='(not impacted by the discount)'}
|
||||
</span>
|
||||
{if $priceDisplay == 2}
|
||||
<span id="pretaxe_price"><span id="pretaxe_price_display">{convertPrice price=$product->getPrice(false, $smarty.const.NULL, 2)}</span> {l s='tax excl.'}</span>
|
||||
{/if}
|
||||
</p>
|
||||
{if $product->specificPrice AND $product->specificPrice.reduction}
|
||||
<p id="old_price"><span class="bold">
|
||||
{if $priceDisplay >= 0 && $priceDisplay <= 2}
|
||||
{if $productPriceWithoutRedution > $productPrice}
|
||||
<span id="old_price_display">{convertPrice price=$productPriceWithoutRedution}</span>
|
||||
{if $tax_enabled && $display_tax_label == 1}
|
||||
{if $priceDisplay == 1}{l s='tax excl.'}{else}{l s='tax incl.'}{/if}
|
||||
{/if}
|
||||
{/if}
|
||||
{/if}
|
||||
</span>
|
||||
</p>
|
||||
|
||||
{/if}
|
||||
{*{if $product->specificPrice AND $product->specificPrice.reduction_type == 'percentage'}
|
||||
<p id="reduction_percent">{l s='(price reduced by'} <span id="reduction_percent_display">{$product->specificPrice.reduction*100}</span> %{l s=')'}</p>
|
||||
{/if}*}
|
||||
{if $packItems|@count}
|
||||
<p class="pack_price">{l s='instead of'} <span style="text-decoration: line-through;">{convertPrice price=$product->getNoPackPrice()}</span></p>
|
||||
<br class="clear" />
|
||||
{/if}
|
||||
{if $product->ecotax != 0}
|
||||
<p class="price-ecotax">{l s='include'} <span id="ecotax_price_display">{if $priceDisplay == 2}{$ecotax_tax_exc|convertAndFormatPrice}{else}{$ecotax_tax_inc|convertAndFormatPrice}{/if}</span> {l s='for green tax'}
|
||||
{if $product->specificPrice AND $product->specificPrice.reduction}
|
||||
<br />{l s='(not impacted by the discount)'}
|
||||
{/if}
|
||||
</p>
|
||||
{/if}
|
||||
{if !empty($product->unity) && $product->unit_price_ratio > 0.000000}
|
||||
{math equation="pprice / punit_price" pprice=$productPrice punit_price=$product->unit_price_ratio assign=unit_price}
|
||||
<p class="unit-price"><span id="unit_price_display">{convertPrice price=$unit_price}</span> {l s='per'} {$product->unity|escape:'htmlall':'UTF-8'}</p>
|
||||
{/if}
|
||||
{*close if for show price*}
|
||||
{/if}
|
||||
{if !empty($product->unity) && $product->unit_price_ratio > 0.000000}
|
||||
{math equation="pprice / punit_price" pprice=$productPrice punit_price=$product->unit_price_ratio assign=unit_price}
|
||||
<p class="unit-price"><span id="unit_price_display">{convertPrice price=$unit_price}</span> {l s='per'} {$product->unity|escape:'htmlall':'UTF-8'}</p>
|
||||
{/if}
|
||||
{*close if for show price*}
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
<div class="form-right">
|
||||
{if isset($groups)}
|
||||
<!-- attributes -->
|
||||
<div id="attributes">
|
||||
{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>
|
||||
{assign var="groupName" value="group_$id_attribute_group"}
|
||||
<select name="{$groupName}" id="group_{$id_attribute_group|intval}" onchange="javascript:findCombination();">
|
||||
{foreach from=$group.attributes key=id_attribute item=group_attribute}
|
||||
<option value="{$id_attribute|intval}"{if (isset($smarty.get.$groupName) && $smarty.get.$groupName|intval == $id_attribute) || $group.default == $id_attribute} selected="selected"{/if} title="{$group_attribute|escape:'htmlall':'UTF-8'}">{$group_attribute|escape:'htmlall':'UTF-8'}</option>
|
||||
{/foreach}
|
||||
</select>
|
||||
</p>
|
||||
{/if}
|
||||
{/foreach}
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
<div class="form-right">
|
||||
{if isset($groups)}
|
||||
<!-- attributes -->
|
||||
<div id="attributes">
|
||||
{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>
|
||||
{assign var="groupName" value="group_$id_attribute_group"}
|
||||
<select name="{$groupName}" id="group_{$id_attribute_group|intval}" onchange="javascript:findCombination();">
|
||||
{foreach from=$group.attributes key=id_attribute item=group_attribute}
|
||||
<option value="{$id_attribute|intval}"{if (isset($smarty.get.$groupName) && $smarty.get.$groupName|intval == $id_attribute) || $group.default == $id_attribute} selected="selected"{/if} title="{$group_attribute|escape:'htmlall':'UTF-8'}">{$group_attribute|escape:'htmlall':'UTF-8'}</option>
|
||||
{/foreach}
|
||||
</select>
|
||||
</p>
|
||||
{/if}
|
||||
{/foreach}
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
{*<p id="product_reference" {if isset($groups) OR !$product->reference}style="display: none;"{/if}><label for="product_reference">{l s='Reference :'} </label><span class="editable">{$product->reference|escape:'htmlall':'UTF-8'}</span></p>*}
|
||||
{*<p id="product_reference" {if isset($groups) OR !$product->reference}style="display: none;"{/if}><label for="product_reference">{l s='Reference :'} </label><span class="editable">{$product->reference|escape:'htmlall':'UTF-8'}</span></p>*}
|
||||
|
||||
<!-- quantity wanted -->
|
||||
<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} />
|
||||
</p>
|
||||
<!-- quantity wanted -->
|
||||
<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} />
|
||||
</p>
|
||||
|
||||
<!-- minimal quantity wanted -->
|
||||
<p id="minimal_quantity_wanted_p"{if $product->minimal_quantity <= 1 OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if}>{l s='You must add '} <b id="minimal_quantity_label">{$product->minimal_quantity}</b> {l s=' as a minimum quantity to buy this product.'}</p>
|
||||
{if $product->minimal_quantity > 1}
|
||||
<script type="text/javascript">
|
||||
checkMinimalQuantity();
|
||||
</script>
|
||||
{/if}
|
||||
<div class="clear"></div>
|
||||
<p{if (!$allow_oosp && $product->quantity <= 0) OR !$product->available_for_order OR (isset($restricted_country_mode) AND $restricted_country_mode) OR $PS_CATALOG_MODE} style="display: none;"{/if} id="add_to_cart" class="buttons_bottom_block"><input type="submit" name="Submit" value="{l s='Add to cart'}" class="exclusive" /></p>
|
||||
<!-- minimal quantity wanted -->
|
||||
<p id="minimal_quantity_wanted_p"{if $product->minimal_quantity <= 1 OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if}>{l s='You must add '} <b id="minimal_quantity_label">{$product->minimal_quantity}</b> {l s=' as a minimum quantity to buy this product.'}</p>
|
||||
{if $product->minimal_quantity > 1}
|
||||
<script type="text/javascript">
|
||||
checkMinimalQuantity();
|
||||
</script>
|
||||
{/if}
|
||||
<div class="clear"></div>
|
||||
<p{if (!$allow_oosp && $product->quantity <= 0) OR !$product->available_for_order OR (isset($restricted_country_mode) AND $restricted_country_mode) OR $PS_CATALOG_MODE} style="display: none;"{/if} id="add_to_cart" class="buttons_bottom_block"><input type="submit" name="Submit" value="{l s='Add to cart'}" class="exclusive" /></p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="clear"></div>
|
||||
<!-- availability -->
|
||||
|
||||
Loading…
Reference in New Issue
Block a user