Merge branch 'ticket-11985-MondialRelay_part2' into develop

This commit is contained in:
Marion Muszynski 2017-01-11 16:58:28 +01:00
commit 654908b9bf

View File

@ -5,7 +5,8 @@ include_once dirname(__FILE__).'/../../modules/privatesales/Sale.php';
class Cart extends CartCore {
public static $carrier_special = array(51, 52, 58);
//public static $carrier_special = array(51, 52, 58);
public static $carrier_special = array(29, 30, 36,37);
protected static $_cache_getSimpleQuantities = NULL;
/**