Revert changes

skovalenk · May 7, 2020 · 65c7153 · 65c7153
1 parent b60504e
commit 65c7153
Showing 1 changed file with 2 additions and 27 deletions.
diff --git a/app/code/Magento/SalesRule/Model/Quote/Discount.php b/app/code/Magento/SalesRule/Model/Quote/Discount.php
@@ -8,7 +8,6 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\SalesRule\Api\Data\RuleDiscountInterfaceFactory;
 use Magento\SalesRule\Api\Data\DiscountDataInterfaceFactory;
-use Magento\Quote\Api\Data\AddressExtensionFactory;
 
 /**
  * Discount totals calculation model.
@@ -51,28 +50,21 @@ class Discount extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
      */
     private $discountDataInterfaceFactory;
 
-    /**
-     * @var AddressExtensionFactory
-     */
-    private $addressExtensionFactory;
-
     /**
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\SalesRule\Model\Validator $validator
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param RuleDiscountInterfaceFactory|null $discountInterfaceFactory
      * @param DiscountDataInterfaceFactory|null $discountDataInterfaceFactory
-     * @param AddressExtensionFactory|null $addressExtensionFactory
      */
     public function __construct(
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\SalesRule\Model\Validator $validator,
         \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
         RuleDiscountInterfaceFactory $discountInterfaceFactory = null,
-        DiscountDataInterfaceFactory $discountDataInterfaceFactory = null,
-        AddressExtensionFactory $addressExtensionFactory = null
+        DiscountDataInterfaceFactory $discountDataInterfaceFactory = null
     ) {
         $this->setCode(self::COLLECTOR_TYPE_CODE);
         $this->eventManager = $eventManager;
@@ -83,8 +75,6 @@ public function __construct(
             ?: ObjectManager::getInstance()->get(RuleDiscountInterfaceFactory::class);
         $this->discountDataInterfaceFactory = $discountDataInterfaceFactory
             ?: ObjectManager::getInstance()->get(DiscountDataInterfaceFactory::class);
-        $this->addressExtensionFactory = $addressExtensionFactory
-            ?: ObjectManager::getInstance()->get(AddressExtensionFactory::class);
     }
 
     /**
@@ -94,7 +84,6 @@ public function __construct(
      * @param \Magento\Quote\Api\Data\ShippingAssignmentInterface $shippingAssignment
      * @param \Magento\Quote\Model\Quote\Address\Total $total
      * @return $this
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
@@ -130,20 +119,7 @@ public function collect(
 
         $address->setDiscountDescription([]);
         $items = $this->calculator->sortItemsByPriority($items, $address);
-
-        if (!is_object($address->getExtensionAttributes())) {
-            $addressExtensionAttributes = $address->getExtensionAttributes();
-            $addressExtension = $this->addressExtensionFactory->create();
-
-            foreach ($addressExtensionAttributes as $key => $value) {
-                $addressExtension->setData($key, $value);
-            }
-            $addressExtension->setDiscounts([]);
-            $address->setExtensionAttributes($addressExtension);
-        } else {
-            $address->getExtensionAttributes()->setDiscounts([]);
-        }
-
+        $address->getExtensionAttributes()->setDiscounts([]);
         $addressDiscountAggregator = [];
 
         /** @var \Magento\Quote\Model\Quote\Item $item */
@@ -324,7 +300,6 @@ private function aggregateDiscountPerRule(
                 }
             }
         }
-
         $address->getExtensionAttributes()->setDiscounts(array_values($addressDiscountAggregator));
     }
 }