Skip to content

Commit 2c1c40d

Browse files
author
Prabhu Ram
committed
MC-19226: Cart Promotions :: Store promotions detail on the quote
- review fixes
1 parent a5e4823 commit 2c1c40d

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

app/code/Magento/QuoteGraphQl/Model/Resolver/Discounts.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ private function getDiscountValues(Quote $quote)
4242
$discountValues=[];
4343
$address = $quote->getShippingAddress();
4444
$totalDiscounts = $address->getExtensionAttributes()->getDiscounts();
45-
if ($totalDiscounts) {
45+
if ($totalDiscounts && is_array($totalDiscounts)) {
4646
foreach ($totalDiscounts as $value) {
4747
$discount = [];
4848
$amount = [];

app/code/Magento/SalesRule/Model/Data/RuleDiscount.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@
99

1010
use Magento\Framework\Api\ExtensionAttributesInterface;
1111
use Magento\SalesRule\Api\Data\RuleDiscountInterface;
12+
use Magento\Framework\Api\AbstractExtensibleObject;
1213

1314
/**
1415
* Data Model for Rule Discount
1516
*/
16-
class RuleDiscount extends \Magento\Framework\Api\AbstractExtensibleObject implements RuleDiscountInterface
17+
class RuleDiscount extends AbstractExtensibleObject implements RuleDiscountInterface
1718
{
1819
const KEY_DISCOUNT_DATA = 'discount';
1920
const KEY_RULE_LABEL = 'rule';

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ public function testDiscountsOnQuoteWithFixedDiscount(): void
164164
/** @var CartItemInterface $item */
165165
$item = $quote->getItems()[0];
166166
$quoteItemDiscounts = $item->getExtensionAttributes()->getDiscounts();
167+
$this->assertArrayHasKey('0', $quoteItemDiscounts);
167168
$discountData = $quoteItemDiscounts[0]->getDiscountData();
168169
$ruleLabel = $quoteItemDiscounts[0]->getRuleLabel();
169170
$this->assertEquals(5, $discountData->getAmount());
@@ -173,6 +174,7 @@ public function testDiscountsOnQuoteWithFixedDiscount(): void
173174
$this->assertEquals('TestRule_Coupon', $ruleLabel);
174175

175176
$quoteAddressItemDiscount = $quote->getShippingAddressesItems()[0]->getExtensionAttributes()->getDiscounts();
177+
$this->assertArrayHasKey('0', $quoteAddressItemDiscount);
176178
$discountData = $quoteAddressItemDiscount[0]->getDiscountData();
177179
$ruleLabel = $quoteAddressItemDiscount[0]->getRuleLabel();
178180
$this->assertEquals(5, $discountData->getAmount());

dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_cart_fixed_discount.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141

4242
'store_id' => 0,
4343
'store_label' => 'TestRule_Coupon',
44-
4544
]
4645
]
4746
);

0 commit comments

Comments
 (0)