MC-21691: [Integration Tests] Failing - Magento.Braintree.Model.MultishippingTest.testCreateOrdersWithBraintreePaypal

Prabhu Ram · Prabhu Ram · commit 8997b2efdc38 · 2019-10-17T14:43:30.000-05:00
- Added a check for extension attributes
diff --git a/app/code/Magento/SalesRule/Model/RulesApplier.php b/app/code/Magento/SalesRule/Model/RulesApplier.php
@@ -209,7 +209,7 @@ protected function getDiscountData($item, $rule)
      */
     private function setDiscountBreakdown($discountData, $item, $rule)
     {
-        if ($discountData->getAmount() > 0) {
+        if ($discountData->getAmount() > 0 && $item->getExtensionAttributes()) {
             /** @var \Magento\SalesRule\Model\Rule\Action\Discount\Data $discount */
             $discount = $this->discountFactory->create();
             $discount->setBaseOriginalAmount($discountData->getBaseOriginalAmount());

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ protected function getDiscountData($item, $rule)`
`209`	`209`	`*/`
`210`	`210`	`private function setDiscountBreakdown($discountData, $item, $rule)`
`211`	`211`	`{`
`212`		`- if ($discountData->getAmount() > 0) {`
	`212`	`+ if ($discountData->getAmount() > 0 && $item->getExtensionAttributes()) {`
`213`	`213`	`/** @var \Magento\SalesRule\Model\Rule\Action\Discount\Data $discount */`
`214`	`214`	`$discount = $this->discountFactory->create();`
`215`	`215`	`$discount->setBaseOriginalAmount($discountData->getBaseOriginalAmount());`