Merge remote-tracking branch 'origin/MAGETWO-98028' into 2.3-develop

Author: viktym

app/code/Magento/SalesRule/Model/Validator.php

@@ -182,6 +182,8 @@ protected function _getRules(Address $address = null)
     }
 
     /**
+     * Address id getter.
+     *
      * @param Address $address
      * @return string
      */
@@ -327,21 +329,7 @@ public function processShippingAmount(Address $address)
                     $baseDiscountAmount = $rule->getDiscountAmount();
                     break;
                 case \Magento\SalesRule\Model\Rule::CART_FIXED_ACTION:
-                    $cartRules = $address->getCartFixedRules();
-                    if (!isset($cartRules[$rule->getId()])) {
-                        $cartRules[$rule->getId()] = $rule->getDiscountAmount();
-                    }
-                    if ($cartRules[$rule->getId()] > 0) {
-                        $quoteAmount = $this->priceCurrency->convert($cartRules[$rule->getId()], $quote->getStore());
-                        $discountAmount = min($shippingAmount - $address->getShippingDiscountAmount(), $quoteAmount);
-                        $baseDiscountAmount = min(
-                            $baseShippingAmount - $address->getBaseShippingDiscountAmount(),
-                            $cartRules[$rule->getId()]
-                        );
-                        $cartRules[$rule->getId()] -= $baseDiscountAmount;
-                    }
-
-                    $address->setCartFixedRules($cartRules);
+                    // Shouldn't be proceed according to MAGETWO-96403
                     break;
             }
 
@@ -519,6 +507,8 @@ public function sortItemsByPriority($items, Address $address = null)
     }
 
     /**
+     * Rule total items getter.
+     *
      * @param int $key
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
@@ -533,6 +523,8 @@ public function getRuleItemTotalsInfo($key)
     }
 
     /**
+     * Decrease rule items count.
+     *
      * @param int $key
      * @return $this
      */