Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Some fixes for customer group pricing #1119

Open
wants to merge 9 commits into
base: develop
Choose a base branch
from
Open

Some fixes for customer group pricing #1119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3d95573
Fix pricing when using with&without tax with customer groups
rbrown Mar 26, 2019
05f97b9
Tidy up grouped/bundled/configurable products from my changes
rbrown Apr 8, 2019
9970df4
Fix pricing when using with&without tax with customer groups
rbrown Mar 26, 2019
e5a0521
Tidy up grouped/bundled/configurable products from my changes
rbrown Apr 8, 2019
237a7b6
Merge branch 'customer_groups' of https://github.com/rbrown/algoliase…
rbrown Apr 9, 2019
bc6dd61
Fix special prices with no expiry
rbrown Apr 9, 2019
454dc46
Make sure $canSpecialBeValid is always defined
rbrown Apr 18, 2019
b71bbd4
Rename $cdfc to $currencyData
rbrown May 22, 2019
636f0a7
Merge branch 'develop' into customer_groups
bsuravech May 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/code/community/Algolia/Algoliasearch/Helper/Config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,8 @@ public function getAttributesToRetrieve($groupId, $store)
foreach ($currencies as $currency) {
$attributes[] = $price.'.'.$currency.'.default';
$attributes[] = $price.'.'.$currency.'.default_formated';
$attributes[] = $price.'.'.$currency.'.default_original';
$attributes[] = $price.'.'.$currency.'.default_original_formated';
damcou marked this conversation as resolved.
Show resolved Hide resolved
$attributes[] = $price.'.'.$currency.'.group_'.$groupId;
$attributes[] = $price.'.'.$currency.'.group_'.$groupId.'_formated';
$attributes[] = $price.'.'.$currency.'.group_'.$groupId.'_original_formated';
Expand Down
171 changes: 93 additions & 78 deletions app/code/community/Algolia/Algoliasearch/Helper/Entity/Producthelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ public function getProductCollectionQuery($storeId, $productIds = null, $only_vi
}

$products = $products
->addAttributeToSelect('special_price')
damcou marked this conversation as resolved.
Show resolved Hide resolved
->addAttributeToSelect('special_from_date')
->addAttributeToSelect('special_to_date')
->addAttributeToSelect('visibility')
Expand Down Expand Up @@ -496,14 +497,22 @@ protected function formatPrice($price, $includeContainer, $currency_code)

protected function handlePrice(Mage_Catalog_Model_Product &$product, $sub_products, &$customData)
{
/** @var Mage_Directory_Model_Currency $directoryCurrency */
$directoryCurrency = Mage::getModel('directory/currency');

/** @var Mage_Tax_Helper_Data $taxHelper */
$taxHelper = Mage::helper('tax');

/** @var Mage_Directory_Helper_Data $directoryHelper */
$directoryHelper = Mage::helper('directory');

$fields = $this->getFields($product->getStore());
$customer_groups_enabled = $this->config->isCustomerGroupsEnabled($product->getStoreId());
$store = $product->getStore();
$type = $this->config->getMappedProductType($product->getTypeId());

/** @var Mage_Directory_Model_Currency $directoryCurrency */
$directoryCurrency = Mage::getModel('directory/currency');
$currencies = $directoryCurrency->getConfigAllowCurrencies();
$baseCurrencyCode = $store->getBaseCurrencyCode();

if (Mage::helper('core')->isModuleEnabled('Mage_Weee') &&
Mage::helper('weee')->getPriceDisplayType($product->getStore()) == 0) {
Expand All @@ -512,102 +521,104 @@ protected function handlePrice(Mage_Catalog_Model_Product &$product, $sub_produc
$weeeTaxAmount = 0;
}

$baseCurrencyCode = $store->getBaseCurrencyCode();

$groups = array();

if ($customer_groups_enabled) {
$groups = Mage::getModel('customer/group')->getCollection();
} else {
$groups = array();
}
$special_price = $product->getSpecialPrice();
$special_from_date = $product->getSpecialFromDate();
$special_to_date = $product->getSpecialToDate();

// There is a special_price and either no to date or a to date in the future
// start date is irrelevant
if ($special_price && Mage::app()->getLocale()->isStoreDateInInterval($store, null, $special_to_date)) {
$canSpecialBeValid = true;
$special_price += $weeeTaxAmount;
} else {
$canSpecialBeValid = false;
}

/** @var Mage_Tax_Helper_Data $taxHelper */
$taxHelper = Mage::helper('tax');

/** @var Mage_Directory_Helper_Data $directoryHelper */
$directoryHelper = Mage::helper('directory');

foreach ($fields as $field => $with_tax) {
$customData[$field] = array();
$field_price = (double) $taxHelper->getPrice($product, $product->getPrice() + $weeeTaxAmount, $with_tax, null, null, null, $store, null);
if ($canSpecialBeValid) {
$field_special_price = (double) $taxHelper->getPrice($product, $special_price, $with_tax, null, null, null, $store, null);
}

foreach ($currencies as $currency_code) {
$customData[$field][$currency_code] = array();
$currencyData = array();

$price = (double) $taxHelper->getPrice($product, $product->getPrice(), $with_tax, null, null, null, $product->getStore(), null);
$price = $directoryHelper->currencyConvert($price, $baseCurrencyCode, $currency_code);
$price += $weeeTaxAmount;
$price = $directoryHelper->currencyConvert($field_price + $weeeTaxAmount, $baseCurrencyCode, $currency_code);

$customData[$field][$currency_code]['default'] = $price;
$customData[$field][$currency_code]['default_formated'] = $this->formatPrice($price, false, $currency_code);
$currencyData['default'] = $price;
$currencyData['default_formated'] = $this->formatPrice($price, false, $currency_code);

$special_price = (double) $taxHelper->getPrice($product, $product->getFinalPrice(), $with_tax, null, null, null, $product->getStore(), null);
$special_price = $directoryHelper->currencyConvert($special_price, $baseCurrencyCode, $currency_code);
$special_price += $weeeTaxAmount;
if ($canSpecialBeValid) {
$special_price = $directoryHelper->currencyConvert($field_special_price + $weeeTaxAmount, $baseCurrencyCode, $currency_code);

// this needs moving up a few levels
$currencyData['special_from_date'] = Mage::app()->getLocale()->storeDate($store, $special_from_date)->getTimestamp();
//if special_to_date is null leave this blank or it will end the special_price!
if ($special_to_date) {
$currencyData['special_to_date'] = Mage::app()->getLocale()->storeDate($store, $special_to_date)->getTimestamp();
}
}
if ($customer_groups_enabled) {
// If fetch special price for groups

foreach ($groups as $group) {
$group_id = (int) $group->getData('customer_group_id');
$group_str = 'group_' . $group_id;
$product->setCustomerGroupId($group_id);

$discounted_price = $product->getPriceModel()->getFinalPrice(1, $product);
$discounted_price = $directoryHelper->currencyConvert($discounted_price, $baseCurrencyCode, $currency_code);
$discounted_price += $weeeTaxAmount;

if ($discounted_price !== false) {
$customData[$field][$currency_code]['group_'.$group_id] = (double) $taxHelper->getPrice($product,
$discounted_price,
$with_tax, null,
null, null,
$product->getStore(),
null);
$customData[$field][$currency_code]['group_'.$group_id] = $directoryHelper->currencyConvert($customData[$field][$currency_code]['group_'.$group_id],
$baseCurrencyCode,
$currency_code);
$customData[$field][$currency_code]['group_'.$group_id.'_formated'] = $store->formatPrice($customData[$field][$currency_code]['group_'.$group_id],
false, $currency_code);
$group_price = $product->getGroupPrice();
$group_price += $weeeTaxAmount;

if ($group_price !== false) {
$currencyData[$group_str] = $directoryHelper->currencyConvert(
(double) $taxHelper->getPrice($product,
$group_price,
$with_tax, null,
null, null,
$store,
null),
$baseCurrencyCode,
$currency_code);
} else {
$customData[$field][$currency_code]['group_'.$group_id] = $customData[$field][$currency_code]['default'];
$customData[$field][$currency_code]['group_'.$group_id.'_formated'] = $customData[$field][$currency_code]['default_formated'];
$currencyData[$group_str] = $currencyData['default'];
}
}

$product->setCustomerGroupId(null);
}

$customData[$field][$currency_code]['special_from_date'] = strtotime($product->getSpecialFromDate());
$customData[$field][$currency_code]['special_to_date'] = strtotime($product->getSpecialToDate());

if ($customer_groups_enabled) {
foreach ($groups as $group) {
$group_id = (int) $group->getData('customer_group_id');

if ($special_price && $special_price < $customData[$field][$currency_code]['group_'.$group_id]) {
$customData[$field][$currency_code]['group_'.$group_id.'_original_formated'] =
$customData[$field][$currency_code]['default_formated'];

$customData[$field][$currency_code]['group_'.$group_id] = $special_price;
$customData[$field][$currency_code]['group_'.$group_id.'_formated'] = $this->formatPrice(
$special_price,
if ($canSpecialBeValid && $special_price < $currencyData[$group_str]) {
$currencyData[$group_str .'_original_formated'] = $this->formatPrice(
$currencyData[$group_str],
false,
$currency_code
);
$currencyData[$group_str .'_original'] = $currencyData[$group_str];

$currencyData[$group_str] = $special_price;
}
$currencyData[$group_str .'_formated'] = $store->formatPrice($currencyData[$group_str], false, $currency_code);
}
$product->setCustomerGroupId(null);
}

if ($special_price && $special_price < $customData[$field][$currency_code]['default']) {
$customData[$field][$currency_code]['default_original_formated'] =
$customData[$field][$currency_code]['default_formated'];
if ($canSpecialBeValid && $special_price < $currencyData['default']) {
$currencyData['default_original_formated'] = $currencyData['default_formated'];
$currencyData['default_original'] = $currencyData['default'];

$customData[$field][$currency_code]['default'] = $special_price;
$customData[$field][$currency_code]['default_formated'] = $this->formatPrice(
$currencyData['default'] = $special_price;
$currencyData['default_formated'] = $this->formatPrice(
$special_price,
false,
$currency_code
);
}

// configurable appears to assume that there are no customer_group_prices
// specified on the attached simple products, but needs re-writing anyway
// to correctly calculate the option price, not the simple price
if ($type == 'grouped' || $type == 'bundle' || $type == 'configurable') {
damcou marked this conversation as resolved.
Show resolved Hide resolved
$min = PHP_INT_MAX;
$max = 0;
Expand Down Expand Up @@ -645,55 +656,59 @@ protected function handlePrice(Mage_Catalog_Model_Product &$product, $sub_produc
$dashed_format = $this->formatPrice($min, false, $currency_code).' - '.$this->formatPrice($max,
false, $currency_code);

if (isset($customData[$field][$currency_code]['default_original_formated']) === false || $min <= $customData[$field][$currency_code]['default']) {
$customData[$field][$currency_code]['default_formated'] = $dashed_format;
if (isset($currencyData['default_original_formated']) === false || $min <= $currencyData['default']) {
$currencyData['default_formated'] = $dashed_format;

//// Do not keep special price that is already taken into account in min max
unset($customData['price']['special_from_date']);
damcou marked this conversation as resolved.
Show resolved Hide resolved
unset($customData['price']['special_to_date']);
unset($customData['price']['default_original_formated']);
unset($currencyData['special_from_date']);
unset($currencyData['special_to_date']);
unset($currencyData['default_original']);
unset($currencyData['default_original_formated']);

$customData[$field][$currency_code]['default'] = 0; // will be reset just after
$currencyData['default'] = 0; // will be reset just after
}

if ($customer_groups_enabled) {
foreach ($groups as $group) {
$group_id = (int) $group->getData('customer_group_id');
$group_str = 'group_' . $group_id;

if ($min != $max && $min <= $customData[$field][$currency_code]['group_'.$group_id]) {
$customData[$field][$currency_code]['group_'.$group_id] = 0;
if ($min != $max && $min <= $currencyData[$group_str]) {
$currencyData[$group_str] = 0;
} else {
$customData[$field][$currency_code]['group_'.$group_id] = $customData[$field][$currency_code]['default'];
$currencyData[$group_str] = $currencyData['default'];
}

$customData[$field][$currency_code]['group_'.$group_id.'_formated'] = $dashed_format;
$currencyData[$group_str .'_formated'] = $dashed_format;
}
}
}

if ($customData[$field][$currency_code]['default'] == 0) {
$customData[$field][$currency_code]['default'] = $min;
if ($currencyData['default'] == 0) {
$currencyData['default'] = $min;

if ($min === $max) {
$customData[$field][$currency_code]['default_formated'] = $this->formatPrice($min, false,
$currencyData['default_formated'] = $this->formatPrice($min, false,
$currency_code);
}
}

if ($customer_groups_enabled) {
foreach ($groups as $group) {
$group_id = (int) $group->getData('customer_group_id');
$group_str = 'group_' . $group_id;

if ($customData[$field][$currency_code]['group_'.$group_id] == 0) {
$customData[$field][$currency_code]['group_'.$group_id] = $min;
if ($currencyData[$group_str] == 0) {
$currencyData[$group_str] = $min;

if ($min === $max) {
$customData[$field][$currency_code]['group_'.$group_id.'_formated'] = $customData[$field][$currency_code]['default_formated'];
$currencyData[$group_str .'_formated'] = $currencyData['default_formated'];
}
}
}
}
}
$customData[$field][$currency_code] = $currencyData;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/design/frontend/base/default/template/algoliasearch/internals/configuration.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ $session = Mage::getSingleton('customer/session');
$customerGroupId = $session->getCustomerGroupId();

$priceKey = '.'.$currencyCode.'.default';
if ($config->isCustomerGroupsEnabled($storeId) && $customerGroupId !== 0) {
damcou marked this conversation as resolved.
Show resolved Hide resolved
if ($config->isCustomerGroupsEnabled($storeId)) {
$priceKey = '.'.$currencyCode.'.group_'.$customerGroupId;
}

Expand Down
Loading