Skip to content

Add ability to set custom product option with negative price #14342

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

Closed
mszydlo wants to merge 1 commit into from
Closed

Add ability to set custom product option with negative price #14342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,7 @@ private function fillProductOptions(Product $product, array $productOptions)
}

$customOption = $this->customOptionFactory->create(['data' => $customOptionData]);
$customOption->setProduct($product);
Copy link
Copy Markdown
Contributor

@ihor-sviziev ihor-sviziev Mar 27, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need this change?

$customOption->setProductSku($product->getSku());
$customOptions[] = $customOption;
}
Expand Down
11 changes: 10 additions & 1 deletion app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

namespace Magento\Catalog\Model\Product\Option\Validator;

use Magento\Catalog\Model\Config\Source\ProductPriceOptionsInterface;
use Magento\Catalog\Model\Product\Option;
use Zend_Validate_Exception;

Expand Down Expand Up @@ -132,7 +133,15 @@ protected function validateOptionType(Option $option)
*/
protected function validateOptionValue(Option $option)
{
return $this->isInRange($option->getPriceType(), $this->priceTypes) && !$this->isNegative($option->getPrice());
$productPrice = 0.0;
if ($option->getPriceType() === ProductPriceOptionsInterface::VALUE_PERCENT) {
Copy link
Copy Markdown
Contributor

@ihor-sviziev ihor-sviziev Mar 27, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you cover these changes with tests?

$productPrice = 100.0;
} elseif ($option->getProduct()) {
$productPrice = $option->getProduct()->getSpecialPrice() ?: $option->getProduct()->getPrice();
}

return $this->isInRange($option->getPriceType(), $this->priceTypes)
&& !$this->isNegative($productPrice + $option->getPrice());
}

/**
Expand Down
16 changes: 13 additions & 3 deletions app/code/Magento/Catalog/Model/Product/Option/Validator/Select.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

namespace Magento\Catalog\Model\Product\Option\Validator;

use Magento\Catalog\Model\Config\Source\ProductPriceOptionsInterface;
use Magento\Catalog\Model\Product\Option;

class Select extends DefaultValidator
Expand Down Expand Up @@ -47,16 +48,25 @@ protected function validateOptionValue(Option $option)
}

$storeId = \Magento\Store\Model\Store::DEFAULT_STORE_ID;
$productPrice = 0.0;
if ($option->getProduct()) {
$storeId = $option->getProduct()->getStoreId();
$productPrice = $option->getProduct()->getSpecialPrice() ?: $option->getProduct()->getPrice();
}
foreach ($values as $value) {
if (isset($value['is_delete']) && (bool)$value['is_delete']) {
continue;
}
$type = isset($value['price_type']) ? $value['price_type'] : null;
$price = isset($value['price']) ? $value['price'] : null;
$title = isset($value['title']) ? $value['title'] : null;
$type = $value['price_type'] ?? null;
$price = $value['price'] ?? 0.0;
$title = $value['title'] ?? null;

if ($type === ProductPriceOptionsInterface::VALUE_PERCENT) {
$price += 100.0;
Copy link
Copy Markdown
Contributor

@ihor-sviziev ihor-sviziev Mar 27, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you describe why do we need to add +100 there?

} else {
$price += $productPrice;
}

if (!$this->isValidOptionPrice($type, $price, $storeId)
|| !$this->isValidOptionTitle($title, $storeId)
) {
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -923,7 +923,7 @@ protected function getPriceFieldConfig($sortOrder)
'addbeforePool' => $this->productOptionsPrice->prefixesToOptionArray(),
'sortOrder' => $sortOrder,
'validation' => [
'validate-zero-or-greater' => true
'validate-number' => true
],
],
],
Expand Down
4 changes: 3 additions & 1 deletion app/code/Magento/Catalog/view/base/web/js/price-options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@ define([
optionConfig: {},
optionHandlers: {},
optionTemplate: '<%= data.label %>' +
'<% if (data.finalPrice.value) { %>' +
'<% if (data.finalPrice.value > 0) { %>' +
Copy link
Copy Markdown
Contributor

@ihor-sviziev ihor-sviziev Mar 27, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't get, why do we need this change?

' +<%- data.finalPrice.formatted %>' +
'<% } else if (data.finalPrice.value) { %>' +
' <%- data.finalPrice.formatted %>' +
'<% } %>',
controlContainer: 'dd'
};
Expand Down