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

#26622 - Check quote item for parentItem instead of parentItemId #26623

Merged
merged 8 commits into from
Feb 9, 2020
+43 −12
Merged

#26622 - Check quote item for parentItem instead of parentItemId #26623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e943bda
#26622 - Check quote item for parentItem instead of parentItemId, as …
aligent-lturner Feb 1, 2020
199afbf
#26622 - Change to check for both parentItemId and parentItem
aligent-lturner Feb 4, 2020
90c3540
#26622 - Update test to check combinations of parentItemId and parent…
aligent-lturner Feb 4, 2020
5f4cc5f
#26622 - Reduce cyclomatic complexity of initTotals function
aligent-lturner Feb 5, 2020
0e9c4ef
#26622 - Update class description to fix failing static test
aligent-lturner Feb 5, 2020
2c961af
#26622 - Fix code style
aligent-lturner Feb 5, 2020
75b03e0
#26622 - Remove unnecessary new lines and variable declaration, and m…
aligent-lturner Feb 6, 2020
a037edf
#26622 - Fix return values of mock object functions
aligent-lturner Feb 6, 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
32 changes: 25 additions & 7 deletions app/code/Magento/SalesRule/Model/Validator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,13 +383,7 @@ public function initTotals($items, Address $address)

foreach ($items as $item) {
//Skipping child items to avoid double calculations
if ($item->getParentItemId()) {
continue;
}
if (!$rule->getActions()->validate($item)) {
continue;
}
if (!$this->canApplyDiscount($item)) {
if (!$this->isValidItemForRule($item, $rule)) {
continue;
}
$qty = $this->validatorUtility->getItemQty($item, $rule);
Expand All @@ -409,6 +403,30 @@ public function initTotals($items, Address $address)
return $this;
}

/**
* Determine if quote item is valid for a given sales rule
*
* @param AbstractItem $item
* @param Rule $rule
* @return bool
*/
private function isValidItemForRule(AbstractItem $item, Rule $rule)
{
if ($item->getParentItemId()) {
return false;
}
if ($item->getParentItem()) {
return false;
}
if (!$rule->getActions()->validate($item)) {
return false;
}
if (!$this->canApplyDiscount($item)) {
return false;
}
return true;
}

/**
* Return item price
*
Expand Down
23 changes: 18 additions & 5 deletions app/code/Magento/SalesRule/Test/Unit/Model/ValidatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
use PHPUnit\Framework\MockObject\MockObject;

/**
* Class ValidatorTest
* Tests for Magento\SalesRule\Model\Validator
* @@SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class ValidatorTest extends \PHPUnit\Framework\TestCase
Expand Down Expand Up @@ -346,11 +346,14 @@ public function testInitTotalsCanApplyDiscount()
'getDiscountCalculationPrice',
'getBaseDiscountCalculationPrice',
'getCalculationPrice',
'getParentItemId'
'getParentItemId',
'getParentItem'
]
);
$item2 = clone $item1;
$items = [$item1, $item2];
$item3 = clone $item1;
$item4 = clone $item1;
$items = [$item1, $item2, $item3, $item4];

$rule->expects($this->any())
->method('getSimpleAction')
Expand All @@ -367,12 +370,22 @@ public function testInitTotalsCanApplyDiscount()
$validator->expects($this->at(0))->method('isValid')->with($item1)->willReturn(false);
$validator->expects($this->at(1))->method('isValid')->with($item2)->willReturn(true);

$item1->expects($this->any())->method('getParentItemId')->willReturn(false);
$item1->expects($this->any())->method('getParentItemId')->willReturn(null);
$item1->expects($this->any())->method('getParentItem')->willReturn(null);
$item1->expects($this->never())->method('getDiscountCalculationPrice');
$item1->expects($this->never())->method('getBaseDiscountCalculationPrice');
$item2->expects($this->any())->method('getParentItemId')->willReturn(false);
$item2->expects($this->any())->method('getParentItemId')->willReturn(null);
$item2->expects($this->any())->method('getParentItem')->willReturn(null);
$item2->expects($this->any())->method('getDiscountCalculationPrice')->willReturn(50);
$item2->expects($this->once())->method('getBaseDiscountCalculationPrice')->willReturn(50);
$item3->expects($this->any())->method('getParentItemId')->willReturn(null);
$item3->expects($this->any())->method('getParentItem')->willReturn($item1);
$item3->expects($this->never())->method('getDiscountCalculationPrice');
$item3->expects($this->never())->method('getBaseDiscountCalculationPrice');
$item4->expects($this->any())->method('getParentItemId')->willReturn(12345);
$item4->expects($this->any())->method('getParentItem')->willReturn(null);
$item4->expects($this->never())->method('getDiscountCalculationPrice');
$item4->expects($this->never())->method('getBaseDiscountCalculationPrice');
$this->utility->expects($this->once())->method('getItemQty')->willReturn(1);
$this->utility->expects($this->any())->method('canProcessRule')->willReturn(true);

Expand Down