Skip to content

Get the weee tax amount for all types that include it #1175

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Get the weee tax amount for all types that include it #1175

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79906f4
fix: get the weee tax amount for all types include it
Sep 8, 2022
2ef008e
fix: get the weee tax amount including taxes
Mar 20, 2023
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
26 changes: 18 additions & 8 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 @@ -505,13 +505,6 @@ protected function handlePrice(Mage_Catalog_Model_Product &$product, $sub_produc
$directoryCurrency = Mage::getModel('directory/currency');
$currencies = $directoryCurrency->getConfigAllowCurrencies();

if (Mage::helper('core')->isModuleEnabled('Mage_Weee') &&
Mage::helper('weee')->getPriceDisplayType($product->getStore()) == 0) {
$weeeTaxAmount = Mage::helper('weee')->getAmountForDisplay($product);
} else {
$weeeTaxAmount = 0;
}

$baseCurrencyCode = $store->getBaseCurrencyCode();

$groups = array();
Expand All @@ -533,6 +526,8 @@ protected function handlePrice(Mage_Catalog_Model_Product &$product, $sub_produc
$customData[$field][$currency_code] = array();

$price = (double) $taxHelper->getPrice($product, $product->getPrice(), $with_tax, null, null, null, $product->getStore(), null);

$weeeTaxAmount = $this->getWeeeAmount($product, $with_tax);
$price = $directoryHelper->currencyConvert($price, $baseCurrencyCode, $currency_code);
$price += $weeeTaxAmount;

Expand Down Expand Up @@ -1112,7 +1107,7 @@ private function getCompositeTypes()

return $this->compositeTypes;
}

public function getAllProductIds($storeId)
{
$products = Mage::getModel('catalog/product')->getCollection();
Expand Down Expand Up @@ -1313,4 +1308,19 @@ private function clearFacetsQueryRules($index)
}
}
}

private function getWeeeAmount($product, $withTax)
{
// Get the weee tax amount if the weee module is enabled and for all types that include it
if (
!Mage::helper('core')->isModuleEnabled('Mage_Weee') ||
!Mage::helper('weee')->typeOfDisplay($product, [0, 1, 4])
) {
return 0;
}

return $withTax
? Mage::helper('weee')->getAmountForDisplayInclTaxes($product)
: Mage::helper('weee')->getAmountForDisplay($product);
}
}