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

Fixed Custom option price calculation is wrong with multi currency when option price type is percentage #19608

Merged
merged 4 commits into from Feb 15, 2019
Merged

Fixed Custom option price calculation is wrong with multi currency when option price type is percentage #19608

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f7fb186
Fixed Custom option price calculation is wrong with multi currency wh…
Dec 7, 2018
4d84a7a
solved fixed price calculation
Dec 7, 2018
8bdedc5
Update Code for Price Calculation
Feb 9, 2019
fde7fb1
ENGCOM-4217: Static test fix.
p-bystritsky Feb 12, 2019
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
22 changes: 14 additions & 8 deletions app/code/Magento/Catalog/Block/Product/View/Options.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,15 @@
* See COPYING.txt for license details.
*/

/**
* Product options block
*
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Catalog\Block\Product\View;

use Magento\Catalog\Model\Product;
use Magento\Catalog\Model\Product\Option\Value;

/**
* Product options block
*
* @author Magento Core Team <core@magentocommerce.com>
* @api
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
* @since 100.0.2
Expand Down Expand Up @@ -121,6 +120,8 @@ public function setProduct(Product $product = null)
}

/**
* Get group of option.
*
* @param string $type
* @return string
*/
Expand All @@ -142,6 +143,8 @@ public function getOptions()
}

/**
* Check if block has options.
*
* @return bool
*/
public function hasOptions()
Expand All @@ -160,7 +163,10 @@ public function hasOptions()
*/
protected function _getPriceConfiguration($option)
{
$optionPrice = $this->pricingHelper->currency($option->getPrice(true), false, false);
$optionPrice = $option->getPrice(true);
if ($option->getPriceType() !== Value::TYPE_PERCENT) {
$optionPrice = $this->pricingHelper->currency($optionPrice, false, false);
}
$data = [
'prices' => [
'oldPrice' => [
Expand Down Expand Up @@ -195,7 +201,7 @@ protected function _getPriceConfiguration($option)
],
],
'type' => $option->getPriceType(),
'name' => $option->getTitle()
'name' => $option->getTitle(),
];
return $data;
}
Expand Down Expand Up @@ -231,7 +237,7 @@ public function getJsonConfig()
//pass the return array encapsulated in an object for the other modules to be able to alter it eg: weee
$this->_eventManager->dispatch('catalog_product_option_price_configuration_after', ['configObj' => $configObj]);

$config=$configObj->getConfig();
$config = $configObj->getConfig();

return $this->_jsonEncoder->encode($config);
}
Expand Down