Merge branch '2.2-develop' of github.com:magento/magento2ce into SPRINT-41

Author: vital5p

app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php

@@ -142,7 +142,7 @@ public function getDefaultValues()
      */
     protected function _getSelectedOptions()
     {
-        if (is_null($this->_selectedOptions)) {
+        if ($this->_selectedOptions === null) {
             $this->_selectedOptions = [];
 
             /** @var \Magento\Bundle\Model\Option $option */
@@ -152,17 +152,29 @@ protected function _getSelectedOptions()
                 $selectionId = $this->getProduct()->getPreconfiguredValues()->getData(
                     'bundle_option/' . $option->getId()
                 );
-                if ($selectionId && $option->getSelectionById($selectionId)) {
-                    $this->_selectedOptions = $selectionId;
-                } elseif (!$option->getRequired()) {
-                    $this->_selectedOptions = 'None';
-                }
+                $this->assignSelection($option, $selectionId);
             }
         }
 
         return $this->_selectedOptions;
     }
 
+    /**
+     * Set selected options.
+     *
+     * @param \Magento\Bundle\Model\Option $option
+     * @param mixed $selectionId
+     * @return void
+     */
+    protected function assignSelection(\Magento\Bundle\Model\Option $option, $selectionId)
+    {
+        if ($selectionId && $option->getSelectionById($selectionId)) {
+            $this->_selectedOptions = $selectionId;
+        } elseif (!$option->getRequired()) {
+            $this->_selectedOptions = 'None';
+        }
+    }
+
     /**
      * Define if selection is selected
      *

app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php

@@ -17,4 +17,20 @@ class Multi extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Optio
      * @var string
      */
     protected $_template = 'catalog/product/view/type/bundle/option/multi.phtml';
+
+    /**
+     * @inheritdoc
+     */
+    protected function assignSelection(\Magento\Bundle\Model\Option $option, $selectionId)
+    {
+        if (is_array($selectionId)) {
+            foreach ($selectionId as $id) {
+                if ($id && $option->getSelectionById($id)) {
+                    $this->_selectedOptions[] = $id;
+                }
+            }
+        } else {
+            parent::assignSelection($option, $selectionId);
+        }
+    }
 }

app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml

@@ -11,8 +11,9 @@
 <?php
 $product = $block->getProduct();
 $helper = $this->helper('Magento\Catalog\Helper\Output');
+$stripSelection = $product->getConfigureMode() ? true : false;
+$options = $block->decorateArray($block->getOptions($stripSelection));
 ?>
-<?php $options = $block->decorateArray($block->getOptions()); ?>
 <?php if ($product->isSaleable()):?>
     <?php if (count($options)): ?>
 <script type="text/x-magento-init">

app/code/Magento/CatalogImportExport/Model/Export/Product.php

@@ -153,14 +153,15 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
     /**
      * Items per page for collection limitation
      *
-     * @var null
+     * @var int|null
      */
     protected $_itemsPerPage = null;
 
     /**
      * Header columns for export file
      *
      * @var array
+     * @deprecated
      */
     protected $_headerColumns = [];
 
@@ -234,17 +235,15 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
     protected $_fieldsMap = [
         'image' => 'base_image',
         'image_label' => "base_image_label",
-        'image' => 'base_image',
-        'image_label' => 'base_image_label',
         'thumbnail' => 'thumbnail_image',
         'thumbnail_label' => 'thumbnail_image_label',
         self::COL_MEDIA_IMAGE => 'additional_images',
         '_media_image_label' => 'additional_image_labels',
-        Product::COL_STORE => 'store_view_code',
-        Product::COL_ATTR_SET => 'attribute_set_code',
-        Product::COL_TYPE => 'product_type',
-        Product::COL_CATEGORY => 'categories',
-        Product::COL_PRODUCT_WEBSITES => 'product_websites',
+        self::COL_STORE => 'store_view_code',
+        self::COL_ATTR_SET => 'attribute_set_code',
+        self::COL_TYPE => 'product_type',
+        self::COL_CATEGORY => 'categories',
+        self::COL_PRODUCT_WEBSITES => 'product_websites',
         'status' => 'product_online',
         'news_from_date' => 'new_from_date',
         'news_to_date' => 'new_to_date',
@@ -691,7 +690,7 @@ protected function updateDataWithCategoryColumns(&$dataRow, &$rowCategories, $pr
      */
     public function _getHeaderColumns()
     {
-        return $this->_customHeadersMapping($this->_headerColumns);
+        return $this->_customHeadersMapping($this->rowCustomizer->addHeaderColumns($this->_headerColumns));
     }
 
     /**
@@ -700,13 +699,13 @@ public function _getHeaderColumns()
      * @param array $customOptionsData
      * @param array $stockItemRows
      * @return void
+     * @deprecated Logic will be moved to _getHeaderColumns in future release
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     protected function setHeaderColumns($customOptionsData, $stockItemRows)
     {
         if (!$this->_headerColumns) {
-            $customOptCols = [
-                'custom_options',
-            ];
             $this->_headerColumns = array_merge(
                 [
                     self::COL_SKU,
@@ -719,21 +718,19 @@ protected function setHeaderColumns($customOptionsData, $stockItemRows)
                 $this->_getExportMainAttrCodes(),
                 [self::COL_ADDITIONAL_ATTRIBUTES],
                 reset($stockItemRows) ? array_keys(end($stockItemRows)) : [],
-                [],
                 [
                     'related_skus',
                     'related_position',
                     'crosssell_skus',
                     'crosssell_position',
                     'upsell_skus',
-                    'upsell_position'
-                ],
-                ['additional_images', 'additional_image_labels', 'hide_from_product_page']
+                    'upsell_position',
+                    'additional_images',
+                    'additional_image_labels',
+                    'hide_from_product_page',
+                    'custom_options'
+                ]
             );
-            // have we merge custom options columns
-            if ($customOptionsData) {
-                $this->_headerColumns = array_merge($this->_headerColumns, $customOptCols);
-            }
         }
     }
 
@@ -892,10 +889,12 @@ protected function getExportData()
             $productIds = array_keys($rawData);
             $stockItemRows = $this->prepareCatalogInventory($productIds);
 
-            $this->rowCustomizer->prepareData($this->_getEntityCollection(), $productIds);
+            $this->rowCustomizer->prepareData(
+                $this->_prepareEntityCollection($this->_entityCollectionFactory->create()),
+                $productIds
+            );
 
             $this->setHeaderColumns($multirawData['customOptionsData'], $stockItemRows);
-            $this->_headerColumns = $this->rowCustomizer->addHeaderColumns($this->_headerColumns);
 
             foreach ($rawData as $productId => $productData) {
                 foreach ($productData as $storeId => $dataRow) {
@@ -1231,9 +1230,6 @@ private function appendMultirowData(&$dataRow, &$multiRawData)
             return null;
         } elseif ($storeId != Store::DEFAULT_STORE_ID) {
             $dataRow[self::COL_STORE] = $this->_storeIdToCode[$storeId];
-            if (isset($productData[Store::DEFAULT_STORE_ID][self::COL_VISIBILITY])) {
-                $dataRow[self::COL_VISIBILITY] = $productData[Store::DEFAULT_STORE_ID][self::COL_VISIBILITY];
-            }
         }
         $dataRow[self::COL_SKU] = $sku;
         return $dataRow;

app/code/Magento/CatalogImportExport/Test/Unit/Model/Export/ProductTest.php

@@ -270,11 +270,15 @@ public function testGetHeaderColumns()
         $headerColumnsValue = ['headerColumns value'];
         $expectedResult = 'result';
         $this->setPropertyValue($product, '_headerColumns', $headerColumnsValue);
-        $product
-            ->expects($this->once())
+        $this->setPropertyValue($product, 'rowCustomizer', $this->rowCustomizer);
+        $product->expects($this->once())
             ->method('_customHeadersMapping')
             ->with($headerColumnsValue)
             ->willReturn($expectedResult);
+        $this->rowCustomizer->expects($this->once())
+            ->method('addHeaderColumns')
+            ->with($headerColumnsValue)
+            ->willReturn($headerColumnsValue);
 
         $result = $product->_getHeaderColumns();
 

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

@@ -13,11 +13,29 @@
 
 class RowCustomizer implements RowCustomizerInterface
 {
+    /**
+     * Header column for Configurable Product variations
+     */
+    const CONFIGURABLE_VARIATIONS_COLUMN = 'configurable_variations';
+
+    /**
+     * Header column for Configurable Product variation labels
+     */
+    const CONFIGURABLE_VARIATIONS_LABELS_COLUMN = 'configurable_variation_labels';
+
     /**
      * @var array
      */
     protected $configurableData = [];
 
+    /**
+     * @var string[]
+     */
+    private $configurableColumns = [
+        self::CONFIGURABLE_VARIATIONS_COLUMN,
+        self::CONFIGURABLE_VARIATIONS_LABELS_COLUMN
+    ];
+
     /**
      * Prepare configurable data for export
      *
@@ -54,8 +72,11 @@ public function prepareData($collection, $productIds)
             }
 
             $this->configurableData[$product->getId()] = [
-                'configurable_variations' => implode(ImportProduct::PSEUDO_MULTI_LINE_SEPARATOR, $variations),
-                'configurable_variation_labels' => implode(
+                self::CONFIGURABLE_VARIATIONS_COLUMN => implode(
+                    ImportProduct::PSEUDO_MULTI_LINE_SEPARATOR,
+                    $variations
+                ),
+                self::CONFIGURABLE_VARIATIONS_LABELS_COLUMN => implode(
                     Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR,
                     $variationsLabels
                 )
@@ -71,17 +92,7 @@ public function prepareData($collection, $productIds)
      */
     public function addHeaderColumns($columns)
     {
-        // have we merge configurable products data
-        if (!empty($this->configurableData)) {
-            $columns = array_merge(
-                $columns,
-                [
-                    'configurable_variations',
-                    'configurable_variation_labels',
-                ]
-            );
-        }
-        return $columns;
+        return array_merge($columns, $this->configurableColumns);
     }
 
     /**

app/code/Magento/Directory/Setup/InstallData.php

@@ -809,27 +809,6 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
             ['BR', 'SE', 'Sergipe'],
             ['BR', 'TO', 'Tocantins'],
             ['BR', 'DF', 'Distrito Federal'],
-            ['HR', 'HR-01', 'Zagrebačka županija'],
-            ['HR', 'HR-02', 'Krapinsko-zagorska županija'],
-            ['HR', 'HR-03', 'Sisačko-moslavačka županija'],
-            ['HR', 'HR-04', 'Karlovačka županija'],
-            ['HR', 'HR-05', 'Varaždinska županija'],
-            ['HR', 'HR-06', 'Koprivničko-križevačka županija'],
-            ['HR', 'HR-07', 'Bjelovarsko-bilogorska županija'],
-            ['HR', 'HR-08', 'Primorsko-goranska županija'],
-            ['HR', 'HR-09', 'Ličko-senjska županija'],
-            ['HR', 'HR-10', 'Virovitičko-podravska županija'],
-            ['HR', 'HR-11', 'Požeško-slavonska županija'],
-            ['HR', 'HR-12', 'Brodsko-posavska županija'],
-            ['HR', 'HR-13', 'Zadarska županija'],
-            ['HR', 'HR-14', 'Osječko-baranjska županija'],
-            ['HR', 'HR-15', 'Šibensko-kninska županija'],
-            ['HR', 'HR-16', 'Vukovarsko-srijemska županija'],
-            ['HR', 'HR-17', 'Splitsko-dalmatinska županija'],
-            ['HR', 'HR-18', 'Istarska županija'],
-            ['HR', 'HR-19', 'Dubrovačko-neretvanska županija'],
-            ['HR', 'HR-20', 'Međimurska županija'],
-            ['HR', 'HR-21', 'Grad Zagreb']
         ];
 
         foreach ($data as $row) {