Merge remote-tracking branch 'origin/develop' into UI

Author: Natalia Momotenko

app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Inventory.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab;
 
+use Magento\Framework\Api\SimpleDataObjectConverter;
+
 /**
  * Product inventory data
  */
@@ -133,7 +135,7 @@ public function getFieldValue($field)
     {
         $stockItem = $this->getStockItem();
         if ($stockItem->getItemId()) {
-            $method = 'get' . \Magento\Framework\Api\SimpleDataObjectConverter::snakeCaseToUpperCamelCase($field);
+            $method = 'get' . SimpleDataObjectConverter::snakeCaseToUpperCamelCase($field);
             if (method_exists($stockItem, $method)) {
                 return $stockItem->{$method}();
             }
@@ -149,7 +151,7 @@ public function getConfigFieldValue($field)
     {
         $stockItem = $this->getStockItem();
         if ($stockItem->getItemId()) {
-            $method = 'getUseConfig' . \Magento\Framework\Api\SimpleDataObjectConverter::snakeCaseToUpperCamelCase(
+            $method = 'getUseConfig' . SimpleDataObjectConverter::snakeCaseToUpperCamelCase(
                 $field
             );
             if (method_exists($stockItem, $method)) {

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/inventory.phtml

@@ -50,7 +50,7 @@
                                 class="select" disabled="disabled">
                             <option value="1"><?php echo __('Yes') ?></option>
                             <option
-                                value="0"<?php if ($block->getConfigFieldValue('manage_stock') == 0): ?> selected="selected"<?php endif; ?>><?php echo __('No') ?></option>
+                                value="0"<?php if ($block->getFieldValue('manage_stock') == 0): ?> selected="selected"<?php endif; ?>><?php echo __('No') ?></option>
                         </select>
                     </div>
                     <div class="field choice">

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml

@@ -24,7 +24,7 @@
     <div class="control">
         <select id="inventory_manage_stock" name="<?php echo $block->getFieldSuffix() ?>[stock_data][manage_stock]" <?php echo $_readonly;?>>
             <option value="1"><?php echo __('Yes') ?></option>
-            <option value="0"<?php if ($block->getConfigFieldValue('manage_stock') == 0): ?> selected="selected"<?php endif; ?>><?php echo __('No') ?></option>
+            <option value="0"<?php if ($block->getFieldValue('manage_stock') == 0): ?> selected="selected"<?php endif; ?>><?php echo __('No') ?></option>
         </select>
         <input type="hidden" id="inventory_manage_stock_default" value="<?php echo $block->getDefaultConfigValue('manage_stock'); ?>">
         <?php $_checked = ($block->getFieldValue('use_config_manage_stock') || $block->IsNew()) ? 'checked="checked"' : '' ?>

app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml

@@ -25,7 +25,7 @@
     <ul data-mage-init='{"menu":[]}'>
         <% if (data.items.length) { %>
         <% _.each(data.items, function(value){ %>
-        <li <%- data.optionData(value) %>><a href="#"><%- value.label %></a></li>
+        <li <%= data.optionData(value) %>><a href="#"><%- value.label %></a></li>
         <% }); %>
         <% } else { %><span class="mage-suggest-no-records"><%- data.noRecordsText %></span><% } %>
     </ul>
@@ -50,7 +50,7 @@
                 data: {'template_id': data.id}
             });
         });
-        
+
         $suggest.mage('suggest', <?php echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getSelectorOptions())?>)
             .on('suggestselect', function (e, ui) {
                 $(this).val('');

app/code/Magento/Customer/Block/Address/Edit.php

@@ -106,24 +106,22 @@ protected function _prepareLayout()
         if ($addressId = $this->getRequest()->getParam('id')) {
             try {
                 $this->_address = $this->_addressRepository->getById($addressId);
+                if ($this->_address->getCustomerId() != $this->_customerSession->getCustomerId()) {
+                    $this->_address = null;
+                }
             } catch (NoSuchEntityException $e) {
                 $this->_address = null;
             }
         }
 
         if ($this->_address === null || !$this->_address->getId()) {
             $this->_address = $this->addressDataFactory->create();
-            $this->_address->setPrefix(
-                $this->getCustomer()->getPrefix()
-            )->setFirstname(
-                $this->getCustomer()->getFirstname()
-            )->setMiddlename(
-                $this->getCustomer()->getMiddlename()
-            )->setLastname(
-                $this->getCustomer()->getLastname()
-            )->setSuffix(
-                $this->getCustomer()->getSuffix()
-            );
+            $customer = $this->getCustomer();
+            $this->_address->setPrefix($customer->getPrefix());
+            $this->_address->setFirstname($customer->getFirstname());
+            $this->_address->setMiddlename($customer->getMiddlename());
+            $this->_address->setLastname($customer->getLastname());
+            $this->_address->setSuffix($customer->getSuffix());
         }
 
         $this->pageConfig->getTitle()->set($this->getTitle());