Merge remote-tracking branch 'origin/MAGETWO-98912' into 2.1.18-develop-pr71

Author: zakdma

app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config/Matrix.php

@@ -91,6 +91,8 @@ public function __construct(
     }
 
     /**
+     * Return currency symbol.
+     *
      * @return string
      */
     public function getCurrencySymbol()
@@ -173,6 +175,7 @@ public function getEditProductUrl($id)
      * Retrieve attributes data
      *
      * @return array
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     protected function getAttributes()
     {
@@ -263,6 +266,8 @@ public function getImageUploadUrl()
     }
 
     /**
+     * Return product qty.
+     *
      * @param Product $product
      * @return float
      */
@@ -272,6 +277,8 @@ public function getProductStockQty(Product $product)
     }
 
     /**
+     * Return variation wizard.
+     *
      * @param array $initData
      * @return string
      */
@@ -287,6 +294,8 @@ public function getVariationWizard($initData)
     }
 
     /**
+     * Return product configuration matrix.
+     *
      * @return array|null
      */
     public function getProductMatrix()
@@ -298,17 +307,22 @@ public function getProductMatrix()
     }
 
     /**
+     * Return product attributes.
+     *
      * @return array|null
      */
     public function getProductAttributes()
     {
         if ($this->productAttributes === null) {
             $this->prepareVariations();
         }
+
         return $this->productAttributes;
     }
 
     /**
+     * Prepare product variations.
+     *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @return void
      * TODO: move to class
@@ -333,36 +347,13 @@ protected function prepareVariations()
                     $price = $product->getPrice();
                     $variationOptions = [];
                     foreach ($usedProductAttributes as $attribute) {
-                        if (!isset($attributes[$attribute->getAttributeId()])) {
-                            $attributes[$attribute->getAttributeId()] = [
-                                'code' => $attribute->getAttributeCode(),
-                                'label' => $attribute->getStoreLabel(),
-                                'id' => $attribute->getAttributeId(),
-                                'position' => $configurableAttributes[$attribute->getAttributeId()]['position'],
-                                'chosen' => [],
-                            ];
-                            foreach ($attribute->getOptions() as $option) {
-                                if (!empty($option->getValue())) {
-                                    $attributes[$attribute->getAttributeId()]['options'][] = [
-                                        'attribute_code' => $attribute->getAttributeCode(),
-                                        'attribute_label' => $attribute->getStoreLabel(0),
-                                        'id' => $option->getValue(),
-                                        'label' => $option->getLabel(),
-                                        'value' => $option->getValue(),
-                                    ];
-                                }
-                            }
-                        }
-                        $optionId = $variation[$attribute->getId()]['value'];
-                        $variationOption = [
-                            'attribute_code' => $attribute->getAttributeCode(),
-                            'attribute_label' => $attribute->getStoreLabel(0),
-                            'id' => $optionId,
-                            'label' => $variation[$attribute->getId()]['label'],
-                            'value' => $optionId,
-                        ];
-                        $variationOptions[] = $variationOption;
-                        $attributes[$attribute->getAttributeId()]['chosen'][] = $variationOption;
+                        list($attributes, $variationOptions) = $this->prepareAttributes(
+                            $attributes,
+                            $attribute,
+                            $configurableAttributes,
+                            $variation,
+                            $variationOptions
+                        );
                     }
 
                     $productMatrix[] = [
@@ -376,12 +367,66 @@ protected function prepareVariations()
                         'price' => $price,
                         'options' => $variationOptions,
                         'weight' => $product->getWeight(),
-                        'status' => $product->getStatus()
+                        'status' => $product->getStatus(),
+                        '__disableTmpl' => true,
                     ];
                 }
             }
         }
         $this->productMatrix = $productMatrix;
         $this->productAttributes = array_values($attributes);
     }
+
+    /**
+     * Prepare attributes.
+     *
+     * @param array $attributes
+     * @param object $attribute
+     * @param array $configurableAttributes
+     * @param array $variation
+     * @param array $variationOptions
+     * @return array
+     */
+    private function prepareAttributes(
+        array $attributes,
+        $attribute,
+        array $configurableAttributes,
+        array $variation,
+        array $variationOptions
+    ) {
+        if (!isset($attributes[$attribute->getAttributeId()])) {
+            $attributes[$attribute->getAttributeId()] = [
+                'code' => $attribute->getAttributeCode(),
+                'label' => $attribute->getStoreLabel(),
+                'id' => $attribute->getAttributeId(),
+                'position' => $configurableAttributes[$attribute->getAttributeId()]['position'],
+                'chosen' => [],
+            ];
+            foreach ($attribute->getOptions() as $option) {
+                if (!empty($option->getValue())) {
+                    $attributes[$attribute->getAttributeId()]['options'][] = [
+                        'attribute_code' => $attribute->getAttributeCode(),
+                        'attribute_label' => $attribute->getStoreLabel(0),
+                        'id' => $option->getValue(),
+                        'label' => $option->getLabel(),
+                        'value' => $option->getValue(),
+                        '__disableTmpl' => true,
+                    ];
+                }
+            }
+        }
+        $optionId = $variation[$attribute->getId()]['value'];
+        $variationOption = [
+            'attribute_code' => $attribute->getAttributeCode(),
+            'attribute_label' => $attribute->getStoreLabel(0),
+            'id' => $optionId,
+            'label' => $variation[$attribute->getId()]['label'],
+            'value' => $optionId,
+            '__disableTmpl' => true,
+        ];
+        $variationOptions[] = $variationOption;
+        $attributes[$attribute->getAttributeId()]['chosen'][] = $variationOption;
+
+        return [$attributes, $variationOptions];
+    }
 }