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

// MERGE product_multistore branch : product fields are now editable per shop

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14682 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2012-04-17 13:32:12 +00:00
parent d4d1c35cb9
commit 0c2dd0cd2f
134 changed files with 3185 additions and 1789 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Delivery.php
+5 -5
View File
@@ -34,7 +34,7 @@ class DeliveryCore extends ObjectModel
public $id_shop;
/** @var int **/
public $id_group_shop;
public $id_shop_group;
/** @var integer */
public $id_carrier;
@@ -63,7 +63,7 @@ class DeliveryCore extends ObjectModel
'id_range_weight' =>array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
'id_zone' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
'id_shop' => array('type' => self::TYPE_INT),
'id_group_shop' => array('type' => self::TYPE_INT),
'id_shop_group' => array('type' => self::TYPE_INT),
'price' => array('type' => self::TYPE_FLOAT, 'validate' => 'isPrice', 'required' => true),
),
);
@@ -88,10 +88,10 @@ class DeliveryCore extends ObjectModel
else
$fields['id_shop'] = null;
if ($this->id_group_shop)
$fields['id_group_shop'] = (int)$this->id_group_shop;
if ($this->id_shop_group)
$fields['id_shop_group'] = (int)$this->id_shop_group;
else
$fields['id_group_shop'] = null;
$fields['id_shop_group'] = null;
return $fields;
}