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

Merge branch 'ticket-11985-MondialRelay_part2' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2017-01-11 18:11:49 +01:00
commit 4aca04400e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
override/classes/PaymentModule.php
View File

@ -375,11 +375,11 @@
'DOM' => '<p>Recibirás un email con el número de seguimiento de tu pedido 48h antes.</p>',
)
);
if ($carrier->id == (int)Configuration::get('ANT_CARRIER_DOM') || $carrier->id == (int)Configuration::get('ANT_CARRIER_DROP')) {
if ((int)$order->id_carrier == (int)Configuration::get('ANT_CARRIER_DOM') || (int)$order->id_carrier == (int)Configuration::get('ANT_CARRIER_DROP')) {
$delivery_carrier = 'DOM';
} elseif (in_array($carrier->id, array_map('intval',explode(',', Configuration::get('ANT_CARRIERS_SOCOL'))))) {
} elseif (in_array((int)$order->id_carrier, array_map('intval',explode(',', Configuration::get('ANT_CARRIERS_SOCOL'))))) {
$delivery_carrier = 'SOCOL_OOH';
} elseif (in_array($carrier->id, array_map('intval',explode(',', Configuration::get('ANT_CARRIERS_MR'))))) {
} elseif (in_array((int)$order->id_carrier, array_map('intval',explode(',', Configuration::get('ANT_CARRIERS_MR'))))) {
$delivery_carrier = 'MR';
} else {
$delivery_carrier = 'DOM'
@ -414,7 +414,7 @@
ON m.`id_mr_method` = s.`id_method`
LEFT JOIN `' . _DB_PREFIX_ . 'country` c
ON c.`iso_code` = s.`MR_Selected_Pays`
WHERE m.`id_carrier` = ' . (int) $carrier->id . '
WHERE m.`id_carrier` = ' . (int) $order->id_carrier . '
AND s.`id_cart` = ' . (int) $order->id_cart . '
AND m.`id_mr_method` IS NOT NULL
')) {