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

Merge branch 'ticket-modifNameCarrierEs'

Browse Source
This commit is contained in:
Marion Muszynski 2016-07-29 13:45:01 +02:00
commit 51e726856d
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/blockordersummary/blockordersummary.php
View File

@ -63,11 +63,15 @@ class BlockOrderSummary extends Module {
$order_address = nl2br(AddressFormat::generateAddress(new Address((int) $cart->id_address_delivery)));
}
$carrier_name = Db::getInstance()->getValue('
SELECT `name`
FROM `'._DB_PREFIX_.'carrier`
WHERE `id_carrier` = '.(int) $cart->id_carrier.'
');
if ($cookie->id_lang == 3 && (int)$cart->id_carrier == 87) {
$carrier_name = "SEUR a domicilio";
} else {
$carrier_name = Db::getInstance()->getValue('
SELECT `name`
FROM `'._DB_PREFIX_.'carrier`
WHERE `id_carrier` = '.(int) $cart->id_carrier.'
');
}
$products_keys = array();
$products_delays = array();

6
themes/site/order-carrier.tpl
View File

@ -140,7 +140,11 @@
<img src="{$carrier.img|escape:'htmlall':'UTF-8'}" alt="{$carrier.name|escape:'htmlall':'UTF-8'}" />
{/if}
{else}
{if $cookie->id_lang == 3 && $carrier.id_carrier == 87}
{l s='SEUR a domicilio'}
{else}
{$carrier.name|escape:'htmlall':'UTF-8'}
{/if}
{/if}
{/if}
</label>
@ -165,7 +169,7 @@
{/if}
{if in_array(5,$sale_delivery)}
<li>{l s='Livraison avant Noël'}</li>
{/if}
{/if}
{if in_array(6,$sale_delivery)}
<li>{l s='Produit Star - Livraison 48h'}</li>
{/if}