Merge branch 'ticket-11987-DeliveryInfoProductTpl'

This commit is contained in:
Marion Muszynski 2016-12-12 15:46:20 +01:00
commit 01a632cd40
3 changed files with 74 additions and 3 deletions

View File

@ -5014,3 +5014,29 @@ body#product #best-sellers_block_product{
body#product div.sale_img img{
background: none;
}
#product .product_info {
/* border-bottom: 1px solid #cac7be; */
padding: 0px 0px 15px;
margin: 0px 0px 20px;
text-align: center;
clear: both;
overflow: auto;
}
#product .product_info .info {
overflow: auto;
font-style: italic;
margin-bottom: 5px;
}
#product .product_info .picto {
background: url('../img/picto_info_produit.jpg') no-repeat top center;
display: block;
height: 30px;
width: 30px;
margin: 0 auto;
}
#product .product_info .info_2 .picto{ background-position: 0 -44px}
#product .product_info .info_3 .picto{ background-position: 0 -82px}
#product .product_info .info .pink{
color: #e36ea2;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

View File

@ -451,7 +451,7 @@ var oneQuantityAvailableSentence = '{l s='Warning: 1 item in stock!' js=1}';
{if $product->description}<li><a id="more_info_tab_more_info" href="#idTab2" style="">{l s='Good to know'}</a></li>{/if}
{*if $product->buy_guide}<li><a id="more_info_tab_data_sheet" href="#idTab3">{l s='Buy guide'}</a></li>{/if*}
{if $product->videos}<li><a id="more_info_tab_more_info" href="#idTab4" style="">{l s='Videos'}</a></li>{/if}
{if $product->description_delivery}<li><a id="more_info_tab_more_info" href="#idTab5" style="">{l s='Shipping'}</a></li>{/if}
<li><a id="more_info_tab_more_info" href="#idTab5" style="">{l s='Shipping'}</a></li>
{*if $features}<li><a id="more_info_tab_data_sheet" href="#idTab2">{l s='Data sheet'}</a></li>{/if*}
{*if $attachments}<li><a id="more_info_tab_attachments" href="#idTab9">{l s='Download'}</a></li>{/if*}
{*if isset($accessories) AND $accessories}<li><a href="#idTab4">{l s='Accessories'}</a></li>{/if*}
@ -478,10 +478,55 @@ var oneQuantityAvailableSentence = '{l s='Warning: 1 item in stock!' js=1}';
<!-- full videos -->
<div id="idTab4" class="rte">{$product->videos}</div>
{/if}
{if $product->description_delivery}
<!-- full description_delivery -->
<div id="idTab5" class="rte">{$product->description_delivery}</div>
<div id="idTab5" class="rte">
<div class="product_info">
<div class="info info_1">
{if $sale->delivery_delay == 2
|| $sale->delivery_delay == 3
|| $sale->delivery_delay == 4
|| $sale->delivery_delay == 5
|| $sale->delivery_delay == 6
|| $sale->delivery_delay == 7
|| $sale->delivery_delay == 8}
{include file="./themes/site_mobile/delay.tpl" delivery_delay=$sale->delivery_delay}
{else}
<span class="picto"></span>
{l s='Livraison estimée sous'} <br />
<span class="pink">{l s=' 3 semaines'}</span>
{/if}
</div>
<div class="info info_2">
<span class="picto"></span>
{l s='Commandez plusieurs marques'} <br />
<span class="pink">{l s='= un seul frais de port !'}</span>
</div>
<div class="info info_3">
<span class="picto"></span>
{l s='Paiement'} <span class="pink">{l s='sécurisé'}</span> <br />
{l s='Paypal & CB'}
</div>
{if isset($delivery_date)}
<div class="delivery-delay-estimation" style="margin-top: 15px;">
{foreach from=$delivery_date key=key item=date}
{if $key == 1}
<p style="text-align:center;">
<b>{$date.name}</b> : <br>{l s='Date de réception prévue entre le'} <strong>{$date.date_start|date_format:'%d/%m/%Y'}</strong> {l s='et le'} <strong>{$date.date_end|date_format:'%d/%m/%Y'}</strong>
</p>
{elseif $key == 5}
<p>
<b>{$date.name}</b> : <br>{l s='Livraison prévue avant le'} <strong>{l s='24/12'}</strong>
</p style="text-align:center;">
{/if}
{/foreach}
</div>
{/if}
</div>
{if !empty($product->description_delivery)}
{$product->description_delivery}
{/if}
</div>
</div>
{if $features}
<!-- product's features -->
<ul id="idTab8" class="bullet">