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-12 14:33:17 +01:00
commit 5f40792fa8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
override/classes/PaymentModule.php
View File

@ -376,13 +376,13 @@
);
$socol_carriers = array_map('intval',explode(',', Configuration::get('ANT_CARRIERS_SOCOL')));
$mr_carriers = array_map('intval',explode(',', Configuration::get('ANT_CARRIERS_MR')));
if(($order->id_carrier) == (int)Configuration::get('ANT_CARRIER_DOM')
|| ($order->id_carrier) == Configuration::get('ANT_CARRIER_DROP')
) {
$dom_carriers = (int)Configuration::get('ANT_CARRIER_DOM');
$drop_carriers = (int)Configuration::get('ANT_CARRIER_DROP');
if((int)$order->id_carrier == $dom_carriers || (int)$order->id_carrier == $drop_carriers) {
$delivery_carrier = 'DOM';
} elseif (in_array($order->id_carrier, $socol_carriers)) {
} elseif (in_array((int)$order->id_carrier, $socol_carriers)) {
$delivery_carrier = 'SOCOL_OOH';
} elseif (in_array($order->id_carrier, $mr_carriers)) {
} elseif (in_array((int)$order->id_carrier, $mr_carriers)) {
$delivery_carrier = 'MR';
} else {
$delivery_carrier = 'DOM';