Merge pull request #800 from magento-tango/MAGETWO-58299

Bug fixes:
* MAGETWO-58299: [Github] Imported configurable products with multiple super attributes do not retain super attribute ordering #6079

Author: magicbunneh

app/code/Magento/ConfigurableImportExport/Model/Export/RowCustomizer.php

@@ -6,7 +6,9 @@
 namespace Magento\ConfigurableImportExport\Model\Export;
 
 use Magento\CatalogImportExport\Model\Export\RowCustomizerInterface;
-use \Magento\CatalogImportExport\Model\Import\Product as ImportProduct;
+use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable as ConfigurableProductType;
+use Magento\CatalogImportExport\Model\Import\Product as ImportProduct;
 use Magento\ImportExport\Model\Import;
 
 class RowCustomizer implements RowCustomizerInterface
@@ -19,51 +21,45 @@ class RowCustomizer implements RowCustomizerInterface
     /**
      * Prepare configurable data for export
      *
-     * @param \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
+     * @param ProductCollection $collection
      * @param int[] $productIds
      * @return void
      */
     public function prepareData($collection, $productIds)
     {
         $productCollection = clone $collection;
-        $productCollection->addAttributeToFilter(
-            'entity_id',
-            ['in' => $productIds]
-        )->addAttributeToFilter(
-            'type_id',
-            ['eq' => \Magento\ConfigurableProduct\Model\Product\Type\Configurable::TYPE_CODE]
-        );
+        $productCollection->addAttributeToFilter('entity_id', ['in' => $productIds])
+            ->addAttributeToFilter('type_id', ['eq' => ConfigurableProductType::TYPE_CODE]);
 
         while ($product = $productCollection->fetchItem()) {
             $productAttributesOptions = $product->getTypeInstance()->getConfigurableOptions($product);
+            $this->configurableData[$product->getId()] = [];
+            $variations = [];
+            $variationsLabels = [];
 
             foreach ($productAttributesOptions as $productAttributeOption) {
-                $this->configurableData[$product->getId()] = [];
-                $variations = [];
-                $variationsLabels = [];
-
                 foreach ($productAttributeOption as $optValues) {
-                    $variations[$optValues['sku']][] =
-                        $optValues['attribute_code'] . '=' . $optValues['option_title'];
+                    $variations[$optValues['sku']][] = $optValues['attribute_code'] . '=' . $optValues['option_title'];
+
                     if (!empty($optValues['super_attribute_label'])) {
-                        $variationsLabels[$optValues['attribute_code']] =
-                            $optValues['attribute_code'] . '=' . $optValues['super_attribute_label'];
+                        $variationsLabels[$optValues['attribute_code']] = $optValues['attribute_code'] . '='
+                            . $optValues['super_attribute_label'];
                     }
                 }
+            }
 
-                foreach ($variations as $sku => $values) {
-                    $variations[$sku] =
-                        'sku=' . $sku . Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR
-                        . implode(Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR, $values);
-                }
-                $variations = implode(ImportProduct::PSEUDO_MULTI_LINE_SEPARATOR, $variations);
-                $variationsLabels = implode(Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR, $variationsLabels);
-
-                $this->configurableData[$product->getId()] = [
-                    'configurable_variations' => $variations,
-                    'configurable_variation_labels' => $variationsLabels,
-                ];
+            foreach ($variations as $sku => $values) {
+                $variations[$sku] = 'sku=' . $sku . Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR
+                    . implode(Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR, $values);
             }
+
+            $this->configurableData[$product->getId()] = [
+                'configurable_variations' => implode(ImportProduct::PSEUDO_MULTI_LINE_SEPARATOR, $variations),
+                'configurable_variation_labels' => implode(
+                    Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR,
+                    $variationsLabels
+                )
+            ];
         }
     }
 

app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php

@@ -498,15 +498,18 @@ protected function _parseVariations($rowData)
             }
 
             if (!empty($fieldAndValuePairs['sku'])) {
+                $position = 0;
                 $additionalRow['_super_products_sku'] = $fieldAndValuePairs['sku'];
                 unset($fieldAndValuePairs['sku']);
                 $additionalRow['display'] = isset($fieldAndValuePairs['display']) ? $fieldAndValuePairs['display'] : 1;
                 unset($fieldAndValuePairs['display']);
                 foreach ($fieldAndValuePairs as $attrCode => $attrValue) {
                     $additionalRow['_super_attribute_code'] = $attrCode;
                     $additionalRow['_super_attribute_option'] = $attrValue;
+                    $additionalRow['_super_attribute_position'] = $position;
                     $additionalRows[] = $additionalRow;
                     $additionalRow = [];
+                    $position += 1;
                 }
             }
         }
@@ -712,7 +715,7 @@ protected function _collectSuperDataLabels($data, $productSuperAttrId, $productI
         $attrParams = $this->_superAttributes[$data['_super_attribute_code']];
         $this->_superAttributesData['attributes'][$productId][$attrParams['id']] = [
             'product_super_attribute_id' => $productSuperAttrId,
-            'position' => 0,
+            'position' => $data['_super_attribute_position'],
         ];
         $label = isset($variationLabels[$data['_super_attribute_code']])
                 ? $variationLabels[$data['_super_attribute_code']]