// Merge -> revision 7875

This commit is contained in:
rMalie
2011-08-03 16:16:49 +00:00
parent 85a22c5f05
commit 83734c7bb9
38 changed files with 320 additions and 85 deletions
+1 -1
View File
@@ -125,7 +125,7 @@ class Dejala extends CarrierModule
$djlCarrier = DejalaCarrierUtils::getCarrierByName($this->name) ;
if (Configuration::get('PS_CARRIER_DEFAULT') == (int)($djlCarrier->id))
{
$carriers = Carrier::getCarriers($this->context->language->id, true, false, false, NULL, PS_CARRIERS_AND_CARRIER_MODULES_NEED_RANGE);
$carriers = Carrier::getCarriers($this->context->language->id, true, false, false, NULL, Carrier::PS_CARRIERS_AND_CARRIER_MODULES_NEED_RANGE);
foreach($carriers as $carrier)
{
if ($carrier['active'] AND !$carrier['deleted'] AND ($carrier['external_module_name'] != $this->name))