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

[*] BO : You have now 3 new default groups. Unidentified group, guest group, and customer group.

Browse Source
This commit is contained in:
vChabot
2011-11-17 17:22:15 +00:00
parent fddc403a09
commit 67fc5d1600
11 changed files with 288 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Customer.php
+8 -3
View File
@@ -185,7 +185,10 @@ class CustomerCore extends ObjectModel
$this->secure_key = md5(uniqid(rand(), true));
$this->last_passwd_gen = date('Y-m-d H:i:s', strtotime('-'.Configuration::get('PS_PASSWD_TIME_FRONT').'minutes'));
if (empty($this->id_default_group))
$this->id_default_group = 1;
if ($this->is_guest)
$this->id_default_group = 2;
else
$this->id_default_group = 3;
/* Can't create a guest customer, if this feature is disabled */
if ($this->is_guest && !Configuration::get('PS_GUEST_CHECKOUT_ENABLED'))
return false;
@@ -524,7 +527,7 @@ class CustomerCore extends ObjectModel
public static function getGroupsStatic($id_customer)
{
if (!Group::isFeatureActive())
return array(1);
return array(3);
if (!isset(self::$_customer_groups[$id_customer]))
{
@@ -560,7 +563,7 @@ class CustomerCore extends ObjectModel
public static function getDefaultGroupId($id_customer)
{
if (!Group::isFeatureActive())
return 1;
return 3;
if (!isset(self::$_defaultGroupId[(int)$id_customer]))
self::$_defaultGroupId[(int)$id_customer] = Db::getInstance()->getValue('
@@ -616,6 +619,8 @@ class CustomerCore extends ObjectModel
$this->is_guest = 0;
$this->passwd = Tools::encrypt($password);
$this->cleanGroups();
$this->addGroups(array(3)); // add default customer group
if ($this->update())
{
$vars = array(
classes/Group.php
+25 -25
View File
@@ -57,8 +57,8 @@ class GroupCore extends ObjectModel
protected $table = 'group';
protected $identifier = 'id_group';
protected static $_cacheReduction = array();
protected static $_groupPriceDisplayMethod = array();
protected static $cache_reduction = array();
protected static $group_price_display_method = array();
protected $webserviceParameters = array();
@@ -66,9 +66,9 @@ class GroupCore extends ObjectModel
{
$this->validateFields();
if (isset($this->id))
$fields['id_group'] = (int)($this->id);
$fields['reduction'] = (float)($this->reduction);
$fields['price_display_method'] = (int)($this->price_display_method);
$fields['id_group'] = (int)$this->id;
$fields['reduction'] = (float)$this->reduction;
$fields['price_display_method'] = (int)$this->price_display_method;
$fields['date_add'] = pSQL($this->date_add);
$fields['date_upd'] = pSQL($this->date_upd);
@@ -87,7 +87,7 @@ class GroupCore extends ObjectModel
return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
SELECT g.`id_group`, g.`reduction`, g.`price_display_method`, gl.`name`
FROM `'._DB_PREFIX_.'group` g
LEFT JOIN `'._DB_PREFIX_.'group_lang` AS gl ON (g.`id_group` = gl.`id_group` AND gl.`id_lang` = '.(int)($id_lang).')
LEFT JOIN `'._DB_PREFIX_.'group_lang` AS gl ON (g.`id_group` = gl.`id_group` AND gl.`id_lang` = '.(int)$id_lang.')
ORDER BY g.`id_group` ASC');
}
@@ -112,44 +112,44 @@ class GroupCore extends ObjectModel
public static function getReduction($id_customer = null)
{
if (!isset(self::$_cacheReduction['customer'][(int)$id_customer]))
self::$_cacheReduction['customer'][(int)$id_customer] = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
if (!isset(self::$cache_reduction['customer'][(int)$id_customer]))
self::$cache_reduction['customer'][(int)$id_customer] = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
SELECT `reduction`
FROM `'._DB_PREFIX_.'group`
WHERE `id_group` = '.((int)$id_customer ? Customer::getDefaultGroupId((int)$id_customer) : 1));
return self::$_cacheReduction['customer'][(int)$id_customer];
}
WHERE `id_group` = '.((int)$id_customer ? Customer::getDefaultGroupId((int)$id_customer) : (int)Configuration::get('PS_CUSTOMER_GROUP')));
return self::$cache_reduction['customer'][(int)$id_customer];
}
public static function getReductionByIdGroup($id_group)
{
if (!isset(self::$_cacheReduction['group'][$id_group]))
if (!isset(self::$cache_reduction['group'][$id_group]))
{
self::$_cacheReduction['group'][$id_group] = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
self::$cache_reduction['group'][$id_group] = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
SELECT `reduction`
FROM `'._DB_PREFIX_.'group`
WHERE `id_group` = '.(int)$id_group);
}
return self::$_cacheReduction['group'][$id_group];
return self::$cache_reduction['group'][$id_group];
}
public static function getPriceDisplayMethod($id_group)
{
if (!isset(self::$_groupPriceDisplayMethod[$id_group]))
self::$_groupPriceDisplayMethod[$id_group] = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
if (!isset(self::$group_price_display_method[$id_group]))
self::$group_price_display_method[$id_group] = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
SELECT `price_display_method`
FROM `'._DB_PREFIX_.'group`
WHERE `id_group` = '.(int)$id_group);
return self::$_groupPriceDisplayMethod[$id_group];
return self::$group_price_display_method[$id_group];
}
public static function getDefaultPriceDisplayMethod()
{
return self::getPriceDisplayMethod(1);
return self::getPriceDisplayMethod((int)Configuration::get('PS_CUSTOMER_GROUP'));
}
public function add($autodate = true, $nullValues = false)
public function add($autodate = true, $null_values = false)
{
if (parent::add($autodate, $nullValues))
if (parent::add($autodate, $null_values))
{
Category::setNewGroupForHome((int)$this->id);
@@ -176,9 +176,9 @@ class GroupCore extends ObjectModel
// Refresh cache of feature detachable
Configuration::updateGlobalValue('PS_GROUP_FEATURE_ACTIVE', self::isCurrentlyUsed());
// Add default group (id 1) to customers without groups
// Add default group (id 3) to customers without groups
Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'customer_group` (
SELECT c.id_customer, 1 FROM `'._DB_PREFIX_.'customer` c
SELECT c.id_customer, '.(int)Configuration::get('PS_CUSTOMER_GROUP').' FROM `'._DB_PREFIX_.'customer` c
LEFT JOIN `'._DB_PREFIX_.'customer_group` cg
ON cg.id_customer = c.id_customer
WHERE cg.id_customer IS NULL)');
@@ -190,7 +190,7 @@ class GroupCore extends ObjectModel
IFNULL((
SELECT min(id_group) FROM `'._DB_PREFIX_.'customer_group`
WHERE id_customer = cg.id_customer),
1)
'.(int)Configuration::get('PS_CUSTOMER_GROUP').')
WHERE `id_default_group` = '.(int)$this->id);
return true;
@@ -217,11 +217,11 @@ class GroupCore extends ObjectModel
*/
public static function isCurrentlyUsed($table = null, $has_active_column = false)
{
// We don't use the parent method, for specific clause reason (id_group != 1)
// We don't use the parent method, for specific clause reason (id_group != 3)
return (bool)Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
SELECT `id_group`
FROM `'._DB_PREFIX_.'group`
WHERE `id_group` != 1
WHERE `id_group` != '.(int)Configuration::get('PS_CUSTOMER_GROUP').'
');
}
classes/GroupReduction.php
+53 -50
View File
@@ -1,6 +1,6 @@
<?php
/*
* 2007-2011 PrestaShop
* 2007-2011 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -31,31 +31,31 @@ class GroupReductionCore extends ObjectModel
public $id_category;
public $reduction;
protected $fieldsRequired = array('id_group', 'id_category', 'reduction');
protected $fieldsValidate = array('id_group' => 'isUnsignedId', 'id_category' => 'isUnsignedId', 'reduction' => 'isPrice');
protected $fieldsRequired = array('id_group', 'id_category', 'reduction');
protected $fieldsValidate = array('id_group' => 'isUnsignedId', 'id_category' => 'isUnsignedId', 'reduction' => 'isPrice');
protected $table = 'group_reduction';
protected $identifier = 'id_group_reduction';
protected $table = 'group_reduction';
protected $identifier = 'id_group_reduction';
protected static $reduction_cache = array();
protected static $reductionCache = array();
public function getFields()
{
$this->validateFields();
$fields['id_group'] = (int)($this->id_group);
$fields['id_category'] = (int)($this->id_category);
$fields['reduction'] = (float)($this->reduction);
$fields['id_group'] = (int)$this->id_group;
$fields['id_category'] = (int)$this->id_category;
$fields['reduction'] = (float)$this->reduction;
return $fields;
}
public function add($autodate = true, $nullValues = false)
public function add($autodate = true, $null_values = false)
{
return (parent::add($autodate, $nullValues) AND $this->_setCache());
return (parent::add($autodate, $null_values) && $this->_setCache());
}
public function update($nullValues = false)
public function update($null_values = false)
{
return (parent::update($nullValues) AND $this->_updateCache());
return (parent::update($null_values) && $this->_updateCache());
}
public function delete()
@@ -63,21 +63,21 @@ class GroupReductionCore extends ObjectModel
$resource = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
SELECT p.`id_product`
FROM `'._DB_PREFIX_.'product` p
WHERE p.`id_category_default` = '.(int)($this->id_category)
WHERE p.`id_category_default` = '.(int)$this->id_category
, false);
while ($row = Db::getInstance()->nextRow($resource))
{
$query = 'DELETE FROM `'._DB_PREFIX_.'product_group_reduction_cache` WHERE `id_product` = '.(int)($row['id_product']);
$query = 'DELETE FROM `'._DB_PREFIX_.'product_group_reduction_cache` WHERE `id_product` = '.(int)$row['id_product'];
if (Db::getInstance()->execute($query) === false)
return false;
}
}
return (parent::delete());
}
protected function _clearCache()
{
return Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'product_group_reduction_cache` WHERE `id_group` = '.(int)($this->id_group));
return Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'product_group_reduction_cache` WHERE `id_group` = '.(int)$this->id_group);
}
protected function _setCache()
@@ -85,16 +85,16 @@ class GroupReductionCore extends ObjectModel
$resource = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
SELECT p.`id_product`
FROM `'._DB_PREFIX_.'product` p
WHERE p.`id_category_default` = '.(int)($this->id_category)
WHERE p.`id_category_default` = '.(int)$this->id_category
, false);
$query = 'INSERT INTO `'._DB_PREFIX_.'product_group_reduction_cache` (`id_product`, `id_group`, `reduction`) VALUES ';
$updated = false;
while ($row = Db::getInstance()->nextRow($resource))
{
$query .= '('.(int)($row['id_product']).', '.(int)($this->id_group).', '.(float)($this->reduction).'), ';
$query .= '('.(int)$row['id_product'].', '.(int)$this->id_group.', '.(float)$this->reduction.'), ';
$updated = true;
}
}
if ($updated)
return (Db::getInstance()->execute(rtrim($query, ', ')));
@@ -106,14 +106,14 @@ class GroupReductionCore extends ObjectModel
$resource = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
SELECT p.`id_product`
FROM `'._DB_PREFIX_.'product` p
WHERE p.`id_category_default` = '.(int)($this->id_category)
WHERE p.`id_category_default` = '.(int)$this->id_category
, false);
while ($row = Db::getInstance()->nextRow($resource))
{
$query = 'UPDATE `'._DB_PREFIX_.'product_group_reduction_cache`
SET `reduction` = '.(float)($this->reduction).'
WHERE `id_product` = '.(int)($row['id_product']).' AND `id_group` = '.(int)($this->id_group);
SET `reduction` = '.(float)$this->reduction.'
WHERE `id_product` = '.(int)$row['id_product'].' AND `id_group` = '.(int)$this->id_group;
if (Db::getInstance()->execute($query) === false)
return false;
}
@@ -122,30 +122,33 @@ class GroupReductionCore extends ObjectModel
public static function getGroupReductions($id_group, $id_lang)
{
$lang = $id_lang.Context::getContext()->shop->addSqlRestrictionOnLang('cl');
return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
SELECT gr.`id_group_reduction`, gr.`id_group`, gr.`id_category`, gr.`reduction`, cl.`name` AS category_name
FROM `'._DB_PREFIX_.'group_reduction` gr
LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON (cl.`id_category` = gr.`id_category` AND cl.`id_lang` = '.(int)$id_lang.Context::getContext()->shop->addSqlRestrictionOnLang('cl').')
WHERE `id_group` = '.(int)($id_group)
LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON (cl.`id_category` = gr.`id_category` AND cl.`id_lang` = '.(int)$lang.')
WHERE `id_group` = '.(int)$id_group
);
}
public static function getValueForProduct($id_product, $id_group)
{
if (!isset(self::$reductionCache[$id_product.'-'.$id_group]))
self::$reductionCache[$id_product.'-'.$id_group] = Db::getInstance()->getValue('SELECT `reduction`
FROM `'._DB_PREFIX_.'product_group_reduction_cache`
WHERE `id_product` = '.(int)($id_product).' AND `id_group` = '.(int)($id_group));
return self::$reductionCache[$id_product.'-'.$id_group];
if (!isset(self::$reduction_cache[$id_product.'-'.$id_group]))
self::$reduction_cache[$id_product.'-'.$id_group] = Db::getInstance()->getValue('
SELECT `reduction`
FROM `'._DB_PREFIX_.'product_group_reduction_cache`
WHERE `id_product` = '.(int)$id_product.' AND `id_group` = '.(int)$id_group);
return self::$reduction_cache[$id_product.'-'.$id_group];
}
public static function doesExist($id_group, $id_category)
{
return (bool)Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('SELECT `id_group`
FROM `'._DB_PREFIX_.'group_reduction`
WHERE `id_group` = '.(int)($id_group).' AND `id_category` = '.(int)($id_category));
return (bool)Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
SELECT `id_group`
FROM `'._DB_PREFIX_.'group_reduction`
WHERE `id_group` = '.(int)$id_group.' AND `id_category` = '.(int)$id_category);
}
public static function getGroupByCategoryId($id_category)
{
return Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('
@@ -153,7 +156,7 @@ class GroupReductionCore extends ObjectModel
FROM `'._DB_PREFIX_.'group_reduction` gr
WHERE `id_category` = '.(int)$id_category
, false);
}
}
public static function getGroupReductionByCategoryId($id_category)
{
@@ -171,26 +174,26 @@ class GroupReductionCore extends ObjectModel
FROM `'._DB_PREFIX_.'product_group_reduction_cache` pgr
WHERE pgr.`id_product` = '.(int)$id_product
);
if (Db::getInstance()->NumRows() == 0)
$query = 'INSERT INTO `'._DB_PREFIX_.'product_group_reduction_cache` (`id_product`, `id_group`, `reduction`)
VALUES ('.(int)($id_product).', '.(int)($id_group).', '.(float)($reduction).')';
VALUES ('.(int)$id_product.', '.(int)$id_group.', '.(float)$reduction.')';
else
$query = 'UPDATE `'._DB_PREFIX_.'product_group_reduction_cache`
SET `reduction` = '.(float)($reduction).'
WHERE `id_product` = '.(int)($id_product).' AND `id_group` = '.(int)($id_group);
SET `reduction` = '.(float)$reduction.'
WHERE `id_product` = '.(int)$id_product.' AND `id_group` = '.(int)$id_group;
return (Db::getInstance()->execute($query));
}
public static function deleteProductReduction($id_product)
{
$query = 'DELETE FROM `'._DB_PREFIX_.'product_group_reduction_cache` WHERE `id_product` = '.(int)($id_product);
$query = 'DELETE FROM `'._DB_PREFIX_.'product_group_reduction_cache` WHERE `id_product` = '.(int)$id_product;
if (Db::getInstance()->execute($query) === false)
return false;
return true;
}
public static function duplicateReduction($id_product_old, $id_product)
{
$row = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('
@@ -200,15 +203,15 @@ class GroupReductionCore extends ObjectModel
);
if (!$row)
return true;
$query = 'INSERT INTO `'._DB_PREFIX_.'product_group_reduction_cache` (`id_product`, `id_group`, `reduction`) VALUES ';
$query .= '('.(int)($id_product).', '.(int)($row['id_group']).', '.(float)($row['reduction']).')';
$query .= '('.(int)$id_product.', '.(int)$row['id_group'].', '.(float)$row['reduction'].')';
return (Db::getInstance()->execute($query));
}
public static function deleteCategory($id_category)
{
$query = 'DELETE FROM `'._DB_PREFIX_.'group_reduction` WHERE `id_category` = '.(int)($id_category);
$query = 'DELETE FROM `'._DB_PREFIX_.'group_reduction` WHERE `id_category` = '.(int)$id_category;
if (Db::getInstance()->execute($query) === false)
return false;
return true;