Merge branch 'tiket-productTemplate' into develop

This commit is contained in:
Marion Muszynski 2016-05-10 16:14:11 +02:00
commit 56683972c7
4 changed files with 51 additions and 54 deletions

View File

@ -5921,7 +5921,7 @@ div#giftvoucher_ask_infos_block .gv_customization > .gv_param input {
#product .delay_flag{
position: absolute;
top: 115px;
left: -15px;
left: -17px;
}
#product #short_description_block {
padding: 0px 20px 0px 20px;

View File

@ -1,53 +1,25 @@
{if $page_name == 'product'}
{if $delivery_delay == 2}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/delay_48h_{$cookie->id_lang}.png" alt="48h">
</div>
{elseif $delivery_delay == 3}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/delay_7j_{$cookie->id_lang}.png" alt="7j">
</div>
{elseif $delivery_delay == 4}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/delay_10j_{$cookie->id_lang}.png" alt="10j">
</div>
{elseif $delivery_delay == 5}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/delay_noel_{$cookie->id_lang}.png" alt="noel">
</div>
{elseif $delivery_delay == 6}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/delay_star_{$cookie->id_lang}.png" alt="star">
</div>
{elseif $delivery_delay == 7}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/delay_72h_{$cookie->id_lang}.png" alt="72h">
</div>
{/if}
{else}
{if $delivery_delay == 2}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/48h_site_{$cookie->id_lang}.png" alt="48h">
</div>
{elseif $delivery_delay == 3}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/7j_site_{$cookie->id_lang}.png" alt="7j">
</div>
{elseif $delivery_delay == 4}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/10j_site_{$cookie->id_lang}.png" alt="10j">
</div>
{elseif $delivery_delay == 5}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/noel_site_{$cookie->id_lang}.png" alt="noel">
</div>
{elseif $delivery_delay == 6}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/star_site_{$cookie->id_lang}.png" alt="star">
</div>
{elseif $delivery_delay == 7}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/72h_site_{$cookie->id_lang}.png" alt="72h">
</div>
{/if}
{if $delivery_delay == 2}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/48h_site_{$cookie->id_lang}.png" alt="48h">
</div>
{elseif $delivery_delay == 3}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/7j_site_{$cookie->id_lang}.png" alt="7j">
</div>
{elseif $delivery_delay == 4}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/10j_site_{$cookie->id_lang}.png" alt="10j">
</div>
{elseif $delivery_delay == 5}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/noel_site_{$cookie->id_lang}.png" alt="noel">
</div>
{elseif $delivery_delay == 6}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/star_site_{$cookie->id_lang}.png" alt="star">
</div>
{elseif $delivery_delay == 7}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/72h_site_{$cookie->id_lang}.png" alt="72h">
</div>
{/if}

View File

@ -0,0 +1,25 @@
{if $delivery_delay == 2}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/delay_48h_{$cookie->id_lang}.png" alt="48h">
</div>
{elseif $delivery_delay == 3}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/delay_7j_{$cookie->id_lang}.png" alt="7j">
</div>
{elseif $delivery_delay == 4}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/delay_10j_{$cookie->id_lang}.png" alt="10j">
</div>
{elseif $delivery_delay == 5}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/delay_noel_{$cookie->id_lang}.png" alt="noel">
</div>
{elseif $delivery_delay == 6}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/delay_star_{$cookie->id_lang}.png" alt="star">
</div>
{elseif $delivery_delay == 7}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/delay_72h_{$cookie->id_lang}.png" alt="72h">
</div>
{/if}

View File

@ -390,7 +390,7 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
|| $sale->delivery_delay == 6
|| $sale->delivery_delay == 7}
<div class="delay_flag" {if !$product->online_only}style="top:55px;"{/if}>
{include file="./themes/site/delay.tpl" delivery_delay=$sale->delivery_delay}
{include file="./themes/site/delay_product.tpl" delivery_delay=$sale->delivery_delay}
</div>
{/if}