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

[+] Project : Add specific prices to a specific customer

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11364 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
jBreux
2011-12-19 15:31:18 +00:00
parent 42bad872d7
commit 4e810c850c
7 changed files with 182 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Product.php
+17 -5
View File
@@ -2195,7 +2195,8 @@ class ProductCore extends ObjectModel
*/
public static function getPriceStatic($id_product, $usetax = true, $id_product_attribute = null, $decimals = 6, $divisor = null,
$only_reduc = false, $usereduc = true, $quantity = 1, $force_associated_tax = false, $id_customer = null, $id_cart = null,
$id_address = null, &$specific_price_output = null, $with_ecotax = true, $use_group_reduction = true, Context $context = null)
$id_address = null, &$specific_price_output = null, $with_ecotax = true, $use_group_reduction = true, Context $context = null,
$use_customer_price = true)
{
if (!$context)
$context = Context::getContext();
@@ -2282,6 +2283,10 @@ class ProductCore extends ObjectModel
&& Configuration::get('VATNUMBER_MANAGEMENT'))
$usetax = false;
$id_customer = 0;
if (Validate::isLoadedObject($context->customer))
$id_customer = $context->customer->id;
return Product::priceCalculation(
$context->shop->getID(),
$id_product,
@@ -2298,7 +2303,9 @@ class ProductCore extends ObjectModel
$usereduc,
$with_ecotax,
$specific_price_output,
$use_group_reduction
$use_group_reduction,
$id_customer,
$use_customer_price
);
}
@@ -2324,8 +2331,12 @@ class ProductCore extends ObjectModel
* @return float Product price
**/
public static function priceCalculation($id_shop, $id_product, $id_product_attribute, $id_country, $id_state, $zipcode, $id_currency,
$id_group, $quantity, $use_tax, $decimals, $only_reduc, $use_reduc, $with_ecotax, &$specific_price, $use_group_reduction)
$id_group, $quantity, $use_tax, $decimals, $only_reduc, $use_reduc, $with_ecotax, &$specific_price, $use_group_reduction,
$id_customer = 0, $use_customer_price = true)
{
if (!$use_customer_price)
$id_customer = 0;
// Caching
if ($id_product_attribute === null)
$product_attribute_label = 'null';
@@ -2333,7 +2344,7 @@ class ProductCore extends ObjectModel
$product_attribute_label = ($id_product_attribute === false ? 'false' : $id_product_attribute);
$cache_id = $id_product.'-'.$id_shop.'-'.$id_currency.'-'.$id_country.'-'.$id_state.'-'.$zipcode.'-'.$id_group.
'-'.$quantity.'-'.$product_attribute_label.'-'.($use_tax?'1':'0').'-'.$decimals.'-'.($only_reduc?'1':'0').
'-'.($use_reduc?'1':'0').'-'.$with_ecotax;
'-'.($use_reduc?'1':'0').'-'.$with_ecotax.'-'.$id_customer;
// reference parameter is filled before any returns
$specific_price = SpecificPrice::getSpecificPrice(
@@ -2343,7 +2354,8 @@ class ProductCore extends ObjectModel
$id_country,
$id_group,
$quantity,
$id_product_attribute
$id_product_attribute,
$id_customer
);
if (isset(self::$_prices[$cache_id]))
classes/SpecificPrice.php
+16 -9
View File
@@ -35,6 +35,7 @@ class SpecificPriceCore extends ObjectModel
public $id_currency;
public $id_country;
public $id_group;
public $id_customer;
public $price;
public $from_quantity;
public $reduction;
@@ -57,6 +58,7 @@ class SpecificPriceCore extends ObjectModel
'id_specific_price_rule' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
'id_country' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
'id_group' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
'id_customer' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
'price' => array('type' => self::TYPE_FLOAT, 'validate' => 'isPrice', 'required' => true),
'from_quantity' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt', 'required' => true),
'reduction' => array('type' => self::TYPE_FLOAT, 'validate' => 'isPrice', 'required' => true),
@@ -108,7 +110,7 @@ class SpecificPriceCore extends ObjectModel
}
// score generation for quantity discount
protected static function _getScoreQuery($id_product, $id_shop, $id_currency, $id_country, $id_group)
protected static function _getScoreQuery($id_product, $id_shop, $id_currency, $id_country, $id_group, $id_customer)
{
$select = '(';
@@ -141,10 +143,11 @@ class SpecificPriceCore extends ObjectModel
if (!$priority)
$priority = Configuration::get('PS_SPECIFIC_PRICE_PRIORITIES');
$priority = 'id_customer;'.$priority;
return preg_split('/;/', $priority);
}
public static function getSpecificPrice($id_product, $id_shop, $id_currency, $id_country, $id_group, $quantity, $id_product_attribute = null)
public static function getSpecificPrice($id_product, $id_shop, $id_currency, $id_country, $id_group, $quantity, $id_product_attribute = null, $id_customer = 0)
{
if (!self::isFeatureActive())
return array();
@@ -158,7 +161,7 @@ class SpecificPriceCore extends ObjectModel
{
$now = date('Y-m-d H:i:s');
self::$_specificPriceCache[$key] = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('
SELECT *, '.self::_getScoreQuery($id_product, $id_shop, $id_currency, $id_country, $id_group).'
SELECT *, '.self::_getScoreQuery($id_product, $id_shop, $id_currency, $id_country, $id_group, $id_customer).'
FROM `'._DB_PREFIX_.'specific_price`
WHERE `id_product` IN (0, '.(int)$id_product.')
AND `id_product_attribute` IN (0, '.(int)$id_product_attribute.')
@@ -166,6 +169,7 @@ class SpecificPriceCore extends ObjectModel
AND `id_currency` IN (0, '.(int)$id_currency.')
AND `id_country` IN (0, '.(int)$id_country.')
AND `id_group` IN (0, '.(int)$id_group.')
AND `id_customer` IN (0, '.(int)$id_customer.')
AND `from_quantity` <= '.(int)$quantity.'
AND
(
@@ -209,7 +213,7 @@ class SpecificPriceCore extends ObjectModel
');
}
public static function getQuantityDiscounts($id_product, $id_shop, $id_currency, $id_country, $id_group, $id_product_attribute = null, $all_combinations = false)
public static function getQuantityDiscounts($id_product, $id_shop, $id_currency, $id_country, $id_group, $id_product_attribute = null, $all_combinations = false, $id_customer = 0)
{
if (!self::isFeatureActive())
return array();
@@ -217,7 +221,7 @@ class SpecificPriceCore extends ObjectModel
$now = date('Y-m-d H:i:s');
$res = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
SELECT *,
'.self::_getScoreQuery($id_product, $id_shop, $id_currency, $id_country, $id_group).'
'.self::_getScoreQuery($id_product, $id_shop, $id_currency, $id_country, $id_group, $id_customer).'
FROM `'._DB_PREFIX_.'specific_price`
WHERE
`id_product` IN(0, '.(int)$id_product.') AND
@@ -225,7 +229,8 @@ class SpecificPriceCore extends ObjectModel
`id_shop` IN(0, '.(int)$id_shop.') AND
`id_currency` IN(0, '.(int)$id_currency.') AND
`id_country` IN(0, '.(int)$id_country.') AND
`id_group` IN(0, '.(int)$id_group.')
`id_group` IN(0, '.(int)$id_group.') AND
`id_customer` IN(0, '.(int)$id_customer.')
AND
(
(`from` = \'0000-00-00 00:00:00\' OR \''.$now.'\' >= `from`)
@@ -253,7 +258,7 @@ class SpecificPriceCore extends ObjectModel
return $targeted_prices;
}
public static function getQuantityDiscount($id_product, $id_shop, $id_currency, $id_country, $id_group, $quantity, $id_product_attribute = null)
public static function getQuantityDiscount($id_product, $id_shop, $id_currency, $id_country, $id_group, $quantity, $id_product_attribute = null, $id_customer = 0)
{
if (!self::isFeatureActive())
return array();
@@ -261,7 +266,7 @@ class SpecificPriceCore extends ObjectModel
$now = date('Y-m-d H:i:s');
return Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('
SELECT *,
'.self::_getScoreQuery($id_product, $id_shop, $id_currency, $id_country, $id_group).'
'.self::_getScoreQuery($id_product, $id_shop, $id_currency, $id_country, $id_group, $id_customer).'
FROM `'._DB_PREFIX_.'specific_price`
WHERE
`id_product` IN(0, '.(int)$id_product.') AND
@@ -270,6 +275,7 @@ class SpecificPriceCore extends ObjectModel
`id_currency` IN(0, '.(int)$id_currency.') AND
`id_country` IN(0, '.(int)$id_country.') AND
`id_group` IN(0, '.(int)$id_group.') AND
`id_customer` IN(0, '.(int)$id_customer.') AND
`from_quantity` >= '.(int)$quantity.'
AND
(
@@ -281,7 +287,7 @@ class SpecificPriceCore extends ObjectModel
');
}
public static function getProductIdByDate($id_shop, $id_currency, $id_country, $id_group, $beginning, $ending)
public static function getProductIdByDate($id_shop, $id_currency, $id_country, $id_group, $beginning, $ending, $id_customer = 0)
{
if (!self::isFeatureActive())
return array();
@@ -293,6 +299,7 @@ class SpecificPriceCore extends ObjectModel
`id_currency` IN(0, '.(int)$id_currency.') AND
`id_country` IN(0, '.(int)$id_country.') AND
`id_group` IN(0, '.(int)$id_group.') AND
`id_customer` IN(0, '.(int)$id_customer.') AND
`from_quantity` = 1 AND
(
(`from` = \'0000-00-00 00:00:00\' OR \''.pSQL($beginning).'\' >= `from`)