Skip to content

Commit 88ea366

Browse files
committed
MAGETWO-39705: It's possible to specify discount more than 100% in Catalog Price Rule
1 parent c9e33ed commit 88ea366

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

app/code/Magento/CatalogRule/Test/Unit/Model/RuleTest.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88

99
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
1010

11+
/**
12+
* Class RuleTest
13+
* @package Magento\CatalogRule\Test\Unit\Model
14+
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
15+
*/
1116
class RuleTest extends \PHPUnit_Framework_TestCase
1217
{
1318
/** @var \Magento\CatalogRule\Model\Rule */
@@ -335,6 +340,7 @@ public function testAfterUpdate()
335340
* Test isRuleBehaviorChanged action
336341
*
337342
* @dataProvider isRuleBehaviorChangedDataProvider
343+
*
338344
* @param array $dataArray
339345
* @param array $originDataArray
340346
* @param bool $isObjectNew

app/code/Magento/CatalogRule/view/adminhtml/templates/promo/js.phtml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ function changeValidationForSubDiscountPercent()
4444
if ($('rule_sub_simple_action').value == 'by_percent' || $('rule_sub_simple_action').value == 'to_percent') {
4545
$('rule_sub_discount_amount').addClassName('validate-number-range number-range-0.00-100.00');
4646
} else {
47-
$('rule_sub_discount_amount').removeClassName('validate-number-range').removeClassName('number-range-0.00-100.00');
47+
$('rule_sub_discount_amount').
48+
removeClassName('validate-number-range').
49+
removeClassName('number-range-0.00-100.00');
4850
}
4951
}
5052

0 commit comments

Comments
 (0)