change fix

magento · Nov 18, 2020 · 4240a6b · 4240a6b
1 parent 7af13d7
commit 4240a6b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 22 deletions.
diff --git a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
@@ -393,9 +393,7 @@ protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $p
 
             if (is_string($_result)) {
                 return $_result;
-            }
-
-            if (!isset($_result[0])) {
+            } elseif (!isset($_result[0])) {
                 return __('Cannot process the item.')->render();
             }
 
@@ -413,11 +411,6 @@ protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $p
                         ]
                     )
                 );
-                if ($buyRequest->getSuperGroup()) {
-                    $serializedValue = $this->serializer->serialize($buyRequest->getSuperGroup());
-                    $_result[0]->addCustomOption('grouped_options', $serializedValue);
-                }
-
                 $products[] = $_result[0];
             } else {
                 $associatedProductsInfo[] = [$subProduct->getId() => $qty];

diff --git a/app/code/Magento/GroupedProduct/Model/Quote/Item/CartItemProcessor.php b/app/code/Magento/GroupedProduct/Model/Quote/Item/CartItemProcessor.php
@@ -49,6 +49,11 @@ class CartItemProcessor implements CartItemProcessorInterface
      */
     private $productOptionFactory;
 
+    /**
+     * @var array|null
+     */
+    private $groupedOptions;
+
     /**
      * @param ObjectFactory $objectFactory
      * @param GroupedOptionsInterfaceFactory $groupedOptionFactory
@@ -84,6 +89,7 @@ public function convertToBuyRequest(CartItemInterface $cartItem): ?DataObject
         if ($extensionAttributes) {
             $groupedOptions = $extensionAttributes->getGroupedOptions();
             if ($groupedOptions) {
+                $this->groupedOptions = $groupedOptions;
                 $requestData = [];
 
                 foreach ($groupedOptions as $item) {
@@ -105,24 +111,16 @@ public function convertToBuyRequest(CartItemInterface $cartItem): ?DataObject
      */
     public function processOptions(CartItemInterface $cartItem): CartItemInterface
     {
-        if ($cartItem->getProductType() !== Grouped::TYPE_CODE) {
+        if (empty($this->groupedOptions) || $cartItem->getProductType() !== Grouped::TYPE_CODE) {
             return $cartItem;
         }
 
-        $groupedOptions = $cartItem->getOptionByCode('grouped_options');
-        $groupedOptionsData = $groupedOptions ? $this->jsonSerializer->unserialize($groupedOptions->getValue()) : null;
-        if ($groupedOptionsData) {
-            $productOptions = [];
-            foreach ($groupedOptionsData as $id => $qty) {
-                $productOptions[] = $this->groupedOptionFactory->create(['id' => $id, 'qty' => $qty]);
-            }
-
-            $extension = $this->productOptionExtensionFactory->create()->setGroupedOptions($productOptions);
-            if (!$cartItem->getProductOption()) {
-                $cartItem->setProductOption($this->productOptionFactory->create());
-            }
-            $cartItem->getProductOption()->setExtensionAttributes($extension);
+        $extension = $this->productOptionExtensionFactory->create()
+            ->setGroupedOptions($this->groupedOptions);
+        if (!$cartItem->getProductOption()) {
+            $cartItem->setProductOption($this->productOptionFactory->create());
         }
+        $cartItem->getProductOption()->setExtensionAttributes($extension);
 
         return $cartItem;
     }