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

Merge branch 'ticket-7768-UpdateSAV' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-11-25 10:49:27 +01:00
commit 3a630a0d93
5 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/blockordersummary/ajax.php
View File

@ -89,6 +89,8 @@ $html .= '</div>
</p>';
} elseif ($k == 5){
$html .= '<p class="delivery-date">Livraison prévue avant le <strong>24/12</strong></p>';
} elseif ($k == 8){
$html .= '<p class="delivery-date">Envoi en 48h</p>';
}
}
}

2
modules/blockordersummary/blockordersummary.php
View File

@ -264,6 +264,8 @@ class BlockOrderSummary extends Module {
</p>';
} elseif ($k == 5){
echo '<p class="delivery-date">'.$this->l('Livraison prévue avant le').' <strong>'.$this->l('24/12').'</strong></p>';
} elseif ($k == 8){
echo '<p class="delivery-date">'.$this->l('Envoi en 48h').'</p>';
}
}
}

4
modules/blockordersummary/blockordersummary.tpl
View File

@ -29,6 +29,10 @@
<p class="delivery-date">
{l s='Livraison prévue avant le' mod='blockordersummary'} <strong>{l s='24/12' mod='blockordersummary'}</strong>
</p>
{elseif $k == 8}
<p class="delivery-date">
{l s='Envoi en 48h' mod='blockordersummary'}
</p>
{/if}
{/foreach}
{/if}

16
themes/site/order-detail.tpl
View File

@ -134,10 +134,24 @@
{if $order->valid && isset($delivery_date)}
<div class="order_delay">
<h4>{l s='Delivery Delay'}</h4>
{foreach from=$delivery_date item=date}
{foreach from=$delivery_date key=k item=date}
{if $k == 1}
<p>
<b style="color: #e26ea2;">{$date.name}</b> : {l s='Date de réception prévue entre le'} <b>{$date.date_start|date_format:'%d/%m/%Y'}</b> {l s='et le'} <b>{$date.date_end|date_format:'%d/%m/%Y'}</b>
</p>
{elseif $k == 5}
<p>
<b style="color: #e26ea2;">{$date.name}</b> : {l s='Date de réception prévue entre le'} <b>{l s='24/12'}</b>
</p>
{elseif $k == 8}
<p>
<b style="color: #e26ea2;">{$date.name}</b> : {l s='Envoi en 48h'}
</p>
{else}
<p>
<b style="color: #e26ea2;">{$date.name}</b>
</p>
{/if}
{/foreach}
</div>
{/if}

24
themes/site_mobile/order-detail.tpl
View File

@ -137,10 +137,24 @@
{if $order->valid && isset($delivery_date)}
<div class="order_delay">
<h4 class="order_shipping">{l s='Delivery Delay'}</h4>
{foreach from=$delivery_date item=date}
{foreach from=$delivery_date key=k item=date}
{if $k == 1}
<p>
<b style="color: #e26ea2;">{$date.name}</b> : {l s='Date de réception prévue entre le'} <b>{$date.date_start|date_format:'%d/%m/%Y'}</b> {l s='et le'} <b>{$date.date_end|date_format:'%d/%m/%Y'}</b>
</p>
{elseif $k == 5}
<p>
<b style="color: #e26ea2;">{$date.name}</b> : {l s='Date de réception prévue entre le'} <b>{l s='24/12'}</b>
</p>
{elseif $k == 8}
<p>
<b style="color: #e26ea2;">{$date.name}</b> : {l s='Envoi en 48h'}
</p>
{else}
<p>
<b style="color: #e26ea2;">{$date.name}</b>
</p>
{/if}
{/foreach}
</div>
{/if}
@ -282,7 +296,7 @@
<!-- Classic products -->
{if $product.product_quantity > $product.customizationQuantityTotal}
<tr class="item">
<td class="cart_product">
<a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category)|escape:'htmlall':'UTF-8'}">
<img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'large')}" alt="{$product.name|escape:'htmlall':'UTF-8'}" {if isset($smallSize)}width="{$smallSize.width}" height="{$smallSize.height}" {/if} />
@ -330,7 +344,7 @@
{/if}
{if !isset($customizedDatas.$productId.$productAttributeId) OR $quantityDisplayed > 0}
<input type="hidden" value="{if $quantityDisplayed == 0 AND isset($customizedDatas.$productId.$productAttributeId)}{$customizedDatas.$productId.$productAttributeId|@count}{else}{$product.cart_quantity-$quantityDisplayed}{/if}" name="quantity_{$product.id_product}_{$product.id_product_attribute}_hidden" />
<input size="2" maxlength="3" type="text" class="cart_quantity_input" value="{$productQuantity|intval}" name="quantity_{$product.id_product}_{$product.id_product_attribute}" />
<input size="2" maxlength="3" type="text" class="cart_quantity_input" value="{$productQuantity|intval}" name="quantity_{$product.id_product}_{$product.id_product_attribute}" />
{/if}
</div>
</div>
@ -359,7 +373,7 @@
{/if}
{if !isset($customizedDatas.$productId.$productAttributeId) OR $quantityDisplayed > 0}
<input type="hidden" value="{if $quantityDisplayed == 0 AND isset($customizedDatas.$productId.$productAttributeId)}{$customizedDatas.$productId.$productAttributeId|@count}{else}{$product.cart_quantity-$quantityDisplayed}{/if}" name="quantity_{$product.id_product}_{$product.id_product_attribute}_hidden" />
<input size="2" maxlength="3" type="text" class="cart_quantity_input" value="{if $quantityDisplayed == 0 AND isset($customizedDatas.$productId.$productAttributeId)}{$customizedDatas.$productId.$productAttributeId|@count}{else}{$product.cart_quantity-$quantityDisplayed}{/if}" name="quantity_{$product.id_product}_{$product.id_product_attribute}" />
<input size="2" maxlength="3" type="text" class="cart_quantity_input" value="{if $quantityDisplayed == 0 AND isset($customizedDatas.$productId.$productAttributeId)}{$customizedDatas.$productId.$productAttributeId|@count}{else}{$product.cart_quantity-$quantityDisplayed}{/if}" name="quantity_{$product.id_product}_{$product.id_product_attribute}" />
{/if}
</div>
<div class="gradient">
@ -577,5 +591,5 @@ $(document).ready(function() {
<p class="footer_links">
<a class="back_account" href="{$link->getPageLink('my-account.php', true)}" class="button">
<i class="icon-user"></i><span>{l s='Back to my account'}</span>
</a>
</a>
</p>