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

Merge branch 'ticket-12340-UpdateDeliveryPrice' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2017-01-30 10:49:23 +01:00
commit 053d3774df
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/blockordersummary/blockordersummary.php
View File

@ -328,7 +328,7 @@ class BlockOrderSummary extends Module {
SELECT *
FROM `'._DB_PREFIX_.'socolissimo_delivery_info`
WHERE `id_cart` = '.(int) $cart->id.'
AND `cecountry` = "FR"
AND `cecountry` IN ("FR","BE","ES")
AND (`pradress1`!= "" OR `pradress2`!= "" OR `pradress3`!= "" OR `pradress4`!= "")
');
if($order == null && (int) $cart->id_carrier == 87) {
@ -347,7 +347,7 @@ class BlockOrderSummary extends Module {
$socol['pradress3'],
$socol['pradress4'],
$socol['przipcode'].' '.$socol['prtown'],
'FRANCE',
$socol['cecountry'],
$socol['cephonenumber'],
!empty($socol['cedoorcode1'])? 'Code porte 1 : '.$socol['cedoorcode1']: '',
!empty($socol['cedoorcode2'])? 'Code porte 2 : '.$socol['cedoorcode2']: '',
@ -396,6 +396,8 @@ class BlockOrderSummary extends Module {
if ($id_lang == 3 && (int)$cart->id_carrier == 87) {
$carrier_name = "SEUR a domicilio";
} elseif ($id_lang == 3 && ((int)$cart->id_carrier == 88 || (int)$cart->id_carrier == 89)) {
$carrier_name = "SEUR puntos de entrega";
} else {
$carrier_name = Db::getInstance()->getValue('
SELECT `name`