Merge remote-tracking branch 'origin/26110_bundle_product_options_fix' into 241-customer-orders

Author: prabhuram93

app/code/Magento/Bundle/Model/Product/Type.php

@@ -6,6 +6,8 @@
 
 namespace Magento\Bundle\Model\Product;
 
+use Magento\Bundle\Model\Option;
+use Magento\Bundle\Model\ResourceModel\Option\Collection;
 use Magento\Bundle\Model\ResourceModel\Selection\Collection as Selections;
 use Magento\Bundle\Model\ResourceModel\Selection\Collection\FilterApplier as SelectionCollectionFilterApplier;
 use Magento\Catalog\Api\ProductRepositoryInterface;
@@ -414,16 +416,13 @@ public function beforeSave($product)
         if ($product->getCanSaveBundleSelections()) {
             $product->canAffectOptions(true);
             $selections = $product->getBundleSelectionsData();
-            if ($selections && !empty($selections)) {
-                $options = $product->getBundleOptionsData();
-                if ($options) {
-                    foreach ($options as $option) {
-                        if (empty($option['delete']) || 1 != (int)$option['delete']) {
-                            $product->setTypeHasOptions(true);
-                            if (1 == (int)$option['required']) {
-                                $product->setTypeHasRequiredOptions(true);
-                                break;
-                            }
+            if (!empty($selections) && $options = $product->getBundleOptionsData()) {
+                foreach ($options as $option) {
+                    if (empty($option['delete']) || 1 != (int)$option['delete']) {
+                        $product->setTypeHasOptions(true);
+                        if (1 == (int)$option['required']) {
+                            $product->setTypeHasRequiredOptions(true);
+                            break;
                         }
                     }
                 }
@@ -464,7 +463,7 @@ public function getOptionsIds($product)
     public function getOptionsCollection($product)
     {
         if (!$product->hasData($this->_keyOptionsCollection)) {
-            /** @var \Magento\Bundle\Model\ResourceModel\Option\Collection $optionsCollection */
+            /** @var Collection $optionsCollection */
             $optionsCollection = $this->_bundleOption->create()
                 ->getResourceCollection();
             $optionsCollection->setProductIdFilter($product->getEntityId());
@@ -530,10 +529,10 @@ public function getSelectionsCollection($optionIds, $product)
      * Example: the catalog inventory validation of decimal qty can change qty to int,
      * so need to change quote item qty option value too.
      *
-     * @param   array $options
-     * @param   \Magento\Framework\DataObject $option
-     * @param   mixed $value
-     * @param   \Magento\Catalog\Model\Product $product
+     * @param  array $options
+     * @param  \Magento\Framework\DataObject $option
+     * @param  mixed $value
+     * @param  \Magento\Catalog\Model\Product $product
      * @return $this
      */
     public function updateQtyOption($options, \Magento\Framework\DataObject $option, $value, $product)
@@ -682,6 +681,11 @@ protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $p
                     $options
                 );
 
+                $this->validateRadioAndSelectOptions(
+                    $optionsCollection,
+                    $options
+                );
+
                 $selectionIds = array_values($this->arrayUtility->flatten($options));
                 // If product has not been configured yet then $selections array should be empty
                 if (!empty($selectionIds)) {
@@ -1184,9 +1188,11 @@ public function canConfigure($product)
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
+    // @codingStandardsIgnoreStart
     public function deleteTypeSpecificData(\Magento\Catalog\Model\Product $product)
     {
     }
+    // @codingStandardsIgnoreEnd
 
     /**
      * Return array of specific to type product entities
@@ -1196,18 +1202,19 @@ public function deleteTypeSpecificData(\Magento\Catalog\Model\Product $product)
      */
     public function getIdentities(\Magento\Catalog\Model\Product $product)
     {
-        $identities = parent::getIdentities($product);
+        $identities = [];
+        $identities[] = parent::getIdentities($product);
         /** @var \Magento\Bundle\Model\Option $option */
         foreach ($this->getOptions($product) as $option) {
             if ($option->getSelections()) {
                 /** @var \Magento\Catalog\Model\Product $selection */
                 foreach ($option->getSelections() as $selection) {
-                    $identities = array_merge($identities, $selection->getIdentities());
+                    $identities[] = $selection->getIdentities();
                 }
             }
         }
 
-        return $identities;
+        return array_merge([], ...$identities);
     }
 
     /**
@@ -1272,6 +1279,53 @@ protected function checkIsAllRequiredOptions($product, $isStrictProcessMode, $op
         }
     }
 
+    /**
+     * Validate Options for Radio and Select input types
+     *
+     * @param Collection $optionsCollection
+     * @param int[] $options
+     * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function validateRadioAndSelectOptions($optionsCollection, $options): void
+    {
+        $errorTypes = [];
+
+        if (is_array($optionsCollection->getItems())) {
+            foreach ($optionsCollection->getItems() as $option) {
+                if ($this->isSelectedOptionValid($option, $options)) {
+                    $errorTypes[] = $option->getType();
+                }
+            }
+        }
+
+        if (!empty($errorTypes)) {
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __(
+                    'Option type (%types) should have only one element.',
+                    ['types' => implode(", ", $errorTypes)]
+                )
+            );
+        }
+    }
+
+    /**
+     * Check if selected option is valid
+     *
+     * @param Option $option
+     * @param array $options
+     * @return bool
+     */
+    private function isSelectedOptionValid($option, $options): bool
+    {
+        return (
+            ($option->getType() == 'radio' || $option->getType() == 'select') &&
+            isset($options[$option->getOptionId()]) &&
+            is_array($options[$option->getOptionId()]) &&
+            count($options[$option->getOptionId()]) > 1
+        );
+    }
+
     /**
      * Check if selection is salable
      *
@@ -1333,16 +1387,18 @@ protected function checkIsResult($_result)
      */
     protected function mergeSelectionsWithOptions($options, $selections)
     {
+        $selections = [];
+
         foreach ($options as $option) {
             $optionSelections = $option->getSelections();
             if ($option->getRequired() && is_array($optionSelections) && count($optionSelections) == 1) {
-                $selections = array_merge($selections, $optionSelections);
+                $selections[] = $optionSelections;
             } else {
                 $selections = [];
                 break;
             }
         }
 
-        return $selections;
+        return array_merge([], ...$selections);
     }
 }

app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml

@@ -265,4 +265,8 @@
         <data key="level">0</data>
         <var key="parent_id" entityType="category" entityKey="id"/>
     </entity>
+    <entity name="AssignProductToCategory" type="category_product_link">
+        <var key="category_id" entityKey="id" entityType="category"/>
+        <var key="sku" entityKey="sku" entityType="product"/>
+    </entity>
 </entities>

app/code/Magento/Catalog/Test/Mftf/Metadata/CategoryMeta.xml

@@ -57,4 +57,12 @@
     <operation name="DeleteCategory" dataType="category" type="delete" auth="adminOauth" url="/V1/categories/{id}" method="DELETE">
         <contentType>application/json</contentType>
     </operation>
+
+    <operation name="AssignProductToCategory" dataType="category_product_link" type="create" auth="adminOauth" url="/V1/categories/{id}/products" method="POST">
+        <contentType>application/json</contentType>
+        <object key="productLink" dataType="category_product_link">
+            <field key="sku">string</field>
+            <field key="category_id">string</field>
+        </object>
+    </operation>
 </operations>