Merge remote-tracking branch 'remotes/origin/develop' into for-pr

Author: Hayder Sharhan

app/code/Magento/Catalog/Controller/Category/View.php

@@ -192,6 +192,7 @@ public function execute()
             if ($layoutUpdates && is_array($layoutUpdates)) {
                 foreach ($layoutUpdates as $layoutUpdate) {
                     $page->addUpdate($layoutUpdate);
+                    $page->addPageLayoutHandles(['layout_update' => md5($layoutUpdate)]);
                 }
             }
 

app/code/Magento/Catalog/Test/Unit/Controller/Category/ViewTest.php

@@ -125,11 +125,12 @@ protected function setUp()
         $this->pageConfig->expects($this->any())->method('addBodyClass')->will($this->returnSelf());
 
         $this->page = $this->getMockBuilder('Magento\Framework\View\Page')
-            ->setMethods(['getConfig', 'initLayout', 'addPageLayoutHandles', 'getLayout'])
+            ->setMethods(['getConfig', 'initLayout', 'addPageLayoutHandles', 'getLayout', 'addUpdate'])
             ->disableOriginalConstructor()->getMock();
         $this->page->expects($this->any())->method('getConfig')->will($this->returnValue($this->pageConfig));
         $this->page->expects($this->any())->method('addPageLayoutHandles')->will($this->returnSelf());
         $this->page->expects($this->any())->method('getLayout')->will($this->returnValue($this->layout));
+        $this->page->expects($this->any())->method('addUpdate')->willReturnSelf();
 
         $this->view = $this->getMock('Magento\Framework\App\ViewInterface');
         $this->view->expects($this->any())->method('getLayout')->will($this->returnValue($this->layout));
@@ -192,8 +193,15 @@ public function testApplyCustomLayoutUpdate()
 
         $this->categoryHelper->expects($this->any())->method('canShow')->will($this->returnValue(true));
 
-        $settings = $this->getMock('Magento\Framework\DataObject', ['getPageLayout'], [], '', false);
+        $settings = $this->getMock(
+            'Magento\Framework\DataObject',
+            ['getPageLayout', 'getLayoutUpdates'],
+            [],
+            '',
+            false
+        );
         $settings->expects($this->atLeastOnce())->method('getPageLayout')->will($this->returnValue($pageLayout));
+        $settings->expects($this->once())->method('getLayoutUpdates')->willReturn(['update1', 'update2']);
 
         $this->catalogDesign->expects($this->any())->method('getDesignSettings')->will($this->returnValue($settings));
 

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml

@@ -7,6 +7,8 @@
 // @codingStandardsIgnoreFile
 
 /** @var $block \Magento\Eav\Block\Adminhtml\Attribute\Edit\Options\Options */
+
+$stores = $block->getStoresSortedBySortOrder();
 ?>
 <fieldset class="fieldset">
     <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Manage Options (Values of Your Attribute)') ?></span></legend>
@@ -15,14 +17,14 @@
             <thead>
                 <tr id="attribute-options-table">
                     <th class="col-draggable"></th>
-                    <th class="col-default control-table-actions-th"><?php /* @escapeNotVerified */ echo __('Is Default') ?></th>
+                    <th class="col-default control-table-actions-th"><span><?php /* @escapeNotVerified */ echo __('Is Default') ?></span></th>
                     <?php
-                    $storelist = $block->getStores();
-                    foreach ($storelist as $_store):
-                        ?>
-                        <th><?php /* @escapeNotVerified */ echo __($_store->getName()) ?></th>
+                    foreach ($stores as $_store): ?>
+                        <th<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> class="_required"<?php endif; ?>>
+                            <span><?php /* @escapeNotVerified */ echo __($_store->getName()) ?></span>
+                        </th>
                     <?php endforeach;
-                    $storetotal = count($storelist) + 3;
+                    $storetotal = count($stores) + 3;
                     ?>
                     <th class="col-delete">&nbsp;</th>
                 </tr>
@@ -59,7 +61,7 @@
             <td class="col-default control-table-actions-cell">
                 <input class="input-radio" type="<%- data.intype %>" name="default[]" value="<%- data.id %>" <%- data.checked %><?php if ($block->getReadOnly()):?>disabled="disabled"<?php endif;?>/>
             </td>
-            <?php foreach ($block->getStores() as $_store): ?>
+            <?php foreach ($stores as $_store): ?>
             <td class="col-<%- data.id %>"><input name="option[value][<%- data.id %>][<?php /* @escapeNotVerified */ echo $_store->getId() ?>]" value="<%- data.store<?php /* @escapeNotVerified */ echo $_store->getId() ?> %>" class="input-text<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> required-option<?php endif; ?>" type="text" <?php if ($block->getReadOnly() || $block->canManageOptionDefaultOnly()):?> disabled="disabled"<?php endif;?>/></td>
             <?php endforeach; ?>
             <td id="delete_button_container_<%- data.id %>" class="col-delete">

app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/Options.php

@@ -72,7 +72,7 @@ public function canManageOptionDefaultOnly()
     /**
      * Retrieve stores collection with default store
      *
-     * @return Collection
+     * @return array
      */
     public function getStores()
     {
@@ -82,6 +82,25 @@ public function getStores()
         return $this->_getData('stores');
     }
 
+    /**
+     * Returns stores sorted by Sort Order
+     * 
+     * @return array
+     */
+    public function getStoresSortedBySortOrder()
+    {
+        $stores = $this->getStores();
+        if (is_array($stores)) {
+            usort($stores, function ($storeA, $storeB) {
+                if ($storeA->getSortOrder() == $storeB->getSortOrder()) {
+                    return $storeA->getId() < $storeB->getId() ? -1 : 1;
+                }
+                return ($storeA->getSortOrder() < $storeB->getSortOrder()) ? -1 : 1;
+            });
+        }
+        return $stores;
+    }
+
     /**
      * Retrieve attribute option values if attribute input type select or multiselect
      *

app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php

@@ -48,12 +48,8 @@ public function add($entityType, $attributeCode, $option)
         if (!$attribute->usesSource()) {
             throw new StateException(__('Attribute %1 doesn\'t work with options', $attributeCode));
         }
-        $optionId = 'new_option';
-        if ($option->getValue()) {
-            $this->validateOption($attribute, $option->getValue());
-            $optionId = $option->getValue();
-        }
 
+        $optionId = $this->getOptionId($option);
         $options = [];
         $options['value'][$optionId][0] = $option->getLabel();
         $options['order'][$optionId] = $option->getSortOrder();
@@ -142,4 +138,13 @@ protected function validateOption($attribute, $optionId)
             );
         }
     }
+
+    /**
+     * @param \Magento\Eav\Api\Data\AttributeOptionInterface $option
+     * @return string
+     */
+    private function getOptionId($option)
+    {
+        return $option->getValue() ?: 'new_option';
+    }
 }

app/code/Magento/ImportExport/Files/Sample/advanced_pricing.csv

@@ -1,5 +1,5 @@
 sku,tier_price_website,tier_price_customer_group,tier_price_qty,tier_price
-sku123,website1,General,2,10
+sku123,base,General,2,10
 sku124,All Websites [USD],ALL GROUPS,3,15
 sku123,,,,
 sku124,,,,