Merge branch 'ticket-deliveryDelay_product' into develop

This commit is contained in:
Marion Muszynski 2016-07-15 10:21:51 +02:00
commit ba60aeacb9
2 changed files with 2 additions and 10 deletions

View File

@ -6732,15 +6732,8 @@ table#carrierTable tbody td {
}
/**** product page show delivery date estimation ****/
.delivery-delay-estimation h4{
display: inline-block;
border: 3px dashed #514C8B;
border-left: 0px;
border-right: 0px;
border-top: 0px;
margin: 10px 0 5px 0;
font-size: 16px;
border-style: double;
.delivery-delay-estimation {
margin-top: 10px;
}
.delivery-delay-estimation p b{
color: #fb66a9;

View File

@ -488,7 +488,6 @@ var oneQuantityAvailableSentence = '{l s='Warning: 1 item in stock!' js=1}';
</div>
{if isset($delivery_date)}
<div class="delivery-delay-estimation">
<h4>{l s='Delivery Delay Estimation'}</h4>
{foreach from=$delivery_date item=date}
<p>
<b>{$date.name}</b> : {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>