Skip to content

Commit 99908ad

Browse files
committed
ACP2E-3498: Incorrect discount value when multiple cart price rules are applied simultaneously with discounted/special priced products
1 parent 1ba25dd commit 99908ad

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

app/code/Magento/SalesRule/Test/Unit/Model/Rule/Action/Discount/CartFixedTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2014 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -185,6 +185,7 @@ public function testCalculate(array $shipping, array $ruleDetails): void
185185
->willReturn(true);
186186
$cartExtensionMock = $this->getMockBuilder(CartExtensionInterface::class)
187187
->disableOriginalConstructor()
188+
->addMethods(['getShippingAssignments'])
188189
->getMockForAbstractClass();
189190
$this->quote->expects($this->any())->method('getCartFixedRules')->will($this->returnValue([]));
190191
$store = $this->createMock(Store::class);

app/code/Magento/SalesRule/Test/Unit/Model/ValidatorTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2012 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

dev/tests/integration/testsuite/Magento/SalesRule/Model/Rule/Action/Discount/CartFixedTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright 2018 Adobe
4-
* All Rights Reserved.
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
55
*/
66
declare(strict_types=1);
77

0 commit comments

Comments
 (0)