dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Fix range price creation

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15405 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2012-05-19 08:45:11 +00:00
parent b8ad9b0d0d
commit 04f4e669d9
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/range/RangePrice.php
+7 -7
View File
@@ -30,7 +30,7 @@ class RangePriceCore extends ObjectModel
public $id_carrier;
public $delimiter1;
public $delimiter2;
/**
* @see ObjectModel::$definition
*/
@@ -43,7 +43,7 @@ class RangePriceCore extends ObjectModel
'delimiter2' => array('type' => self::TYPE_FLOAT, 'validate' => 'isUnsignedFloat', 'required' => true),
),
);
protected $webserviceParameters = array(
'objectsNodeName' => 'price_ranges',
'objectNodeName' => 'price_range',
@@ -51,7 +51,7 @@ class RangePriceCore extends ObjectModel
'id_carrier' => array('xlink_resource' => 'carriers'),
)
);
/**
* Override add to create delivery value for all zones
* @see classes/ObjectModelCore::add()
@@ -70,7 +70,7 @@ class RangePriceCore extends ObjectModel
foreach ($carrier->getZones() as $zone)
$price_list[] = array(
'id_range_price' => (int)$this->id,
'id_price_weight' => 0,
'id_range_weight' => 0,
'id_carrier' => (int)$this->id_carrier,
'id_zone' => (int)$zone['id_zone'],
'price' => 0,
@@ -79,7 +79,7 @@ class RangePriceCore extends ObjectModel
return true;
}
/**
* Get all available price ranges
*
@@ -93,7 +93,7 @@ class RangePriceCore extends ObjectModel
WHERE `id_carrier` = '.(int)$id_carrier.'
ORDER BY `delimiter1` ASC');
}
public static function rangeExist($id_carrier, $delimiter1, $delimiter2)
{
return Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
@@ -102,7 +102,7 @@ class RangePriceCore extends ObjectModel
WHERE `id_carrier` = '.(int)$id_carrier.'
AND `delimiter1` = '.(float)$delimiter1.' AND `delimiter2`='.(float)$delimiter2);
}
public static function isOverlapping($id_carrier, $delimiter1, $delimiter2, $id_rang = null)
{
return Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
classes/range/RangeWeight.php
+6 -6
View File
@@ -30,7 +30,7 @@ class RangeWeightCore extends ObjectModel
public $id_carrier;
public $delimiter1;
public $delimiter2;
/**
* @see ObjectModel::$definition
*/
@@ -43,7 +43,7 @@ class RangeWeightCore extends ObjectModel
'delimiter2' => array('type' => self::TYPE_FLOAT, 'validate' => 'isUnsignedFloat', 'required' => true),
),
);
protected $webserviceParameters = array(
'objectNodeName' => 'weight_range',
'objectsNodeName' => 'weight_ranges',
@@ -51,7 +51,7 @@ class RangeWeightCore extends ObjectModel
'id_carrier' => array('xlink_resource' => 'carriers'),
)
);
/**
* Override add to create delivery value for all zones
* @see classes/ObjectModelCore::add()
@@ -79,7 +79,7 @@ class RangeWeightCore extends ObjectModel
return true;
}
/**
* Get all available price ranges
*
@@ -93,7 +93,7 @@ class RangeWeightCore extends ObjectModel
WHERE `id_carrier` = '.(int)$id_carrier.'
ORDER BY `delimiter1` ASC');
}
public static function rangeExist($id_carrier, $delimiter1, $delimiter2)
{
return Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
@@ -102,7 +102,7 @@ class RangeWeightCore extends ObjectModel
WHERE `id_carrier` = '.(int)$id_carrier.'
AND `delimiter1` = '.(float)$delimiter1.' AND `delimiter2`='.(float)$delimiter2);
}
public static function isOverlapping($id_carrier, $delimiter1, $delimiter2, $id_rang = null)
{
return Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('