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-25 11:35:11 +01:00
commit 3e11994e33
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/logistics/carriers/mondialrelay/mondialrelay.php
View File

@ -486,6 +486,7 @@ class MondialrelayCarrier {
$country = $address['iso_code'];
$postcode = $address['postcode'];
$mode_tri = $mode == 'LD1' ? 'LDR': $mode;
$plantri = Db::getInstance()->getRow('
SELECT *
FROM `'._DB_PREFIX_.'mondialrelay_tri`
@ -493,7 +494,7 @@ class MondialrelayCarrier {
AND `destex` = "'.pSQL($postcode).'"
AND `cppay` = "'.pSQL($country).'"
AND (
`livmod` = "'.pSQL($mode).'"
`livmod` = "'.pSQL($mode_tri).'"
OR `livmod` = "HOM"
)
');
@ -505,7 +506,7 @@ class MondialrelayCarrier {
AND `destex` = "'.pSQL(substr($postcode, 0, 2)).'"
AND `cppay` = "'.pSQL($country).'"
AND (
`livmod` = "'.pSQL($mode).'"
`livmod` = "'.pSQL($mode_tri).'"
OR `livmod` = "HOM"
)
');