Merge branch '2.2-develop' of https://github.com/magento/magento2ce into MAGETWO-87872

dhorytskyi · dhorytskyi · commit 4457a834c793 · 2018-05-23T12:43:43.000+03:00
diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php
@@ -59,8 +59,10 @@ public function execute()
         if (empty($result)) {
             $result[] = [
                 'severity' => (string)\Magento\Framework\Notification\MessageInterface::SEVERITY_NOTICE,
-                'text' => 'You have viewed and resolved all recent system notices. '
-                    . 'Please refresh the web page to clear the notice alert.',
+                'text' => __(
+                    'You have viewed and resolved all recent system notices. '
+                    . 'Please refresh the web page to clear the notice alert.'
+                )
             ];
         }
         $this->getResponse()->representJson($this->jsonHelper->jsonEncode($result));
diff --git a/app/code/Magento/AdminNotification/i18n/en_US.csv b/app/code/Magento/AdminNotification/i18n/en_US.csv
@@ -48,3 +48,4 @@ Severity,Severity
 "Date Added","Date Added"
 Message,Message
 Actions,Actions
+"You have viewed and resolved all recent system notices. Please refresh the web page to clear the notice alert.","You have viewed and resolved all recent system notices. Please refresh the web page to clear the notice alert."
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml
@@ -19,20 +19,12 @@
     </ul>
 </div>
 
-<script>
-require([
-    "jquery",
-    "Magento_Ui/js/modal/modal"
-], function($){
-    if (this.modal) {
-        this.modal.html($('[data-role="system_messages_list"]').html());
-    } else {
-        this.modal = $('[data-role="system_messages_list"]').modal({
-            modalClass: 'modal-system-messages ui-popup-message',
-            type: 'popup',
-            buttons: []
-        });
+<script type="text/x-magento-init">
+    {
+        "[data-role=system_messages_list]": {
+            "Magento_AdminNotification/js/system/messages/popup": {
+                class: 'modal-system-messages ui-popup-message'
+            }
+        }
     }
-    this.modal.modal('openModal');
-});
-</script>
+</script>
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/web/js/system/messages/popup.js b/app/code/Magento/AdminNotification/view/adminhtml/web/js/system/messages/popup.js
@@ -0,0 +1,24 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+*/
+
+define([
+    'jquery',
+    'Magento_Ui/js/modal/modal'
+], function ($) {
+    'use strict';
+
+    return function (data, element) {
+        if (this.modal) {
+            this.modal.html($(element).html());
+        } else {
+            this.modal = $(element).modal({
+                modalClass: data.class,
+                type: 'popup',
+                buttons: []
+            });
+        }
+        this.modal.modal('openModal');
+    };
+});
diff --git a/app/code/Magento/Backend/Block/Dashboard.php b/app/code/Magento/Backend/Block/Dashboard.php
@@ -20,7 +20,7 @@ class Dashboard extends \Magento\Backend\Block\Template
     /**
      * @var string
      */
-    protected $_template = 'dashboard/index.phtml';
+    protected $_template = 'Magento_Backend::dashboard/index.phtml';
 
     /**
      * @return void
diff --git a/app/code/Magento/Backend/Block/Dashboard/Graph.php b/app/code/Magento/Backend/Block/Dashboard/Graph.php
@@ -90,7 +90,7 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
     /**
      * @var string
      */
-    protected $_template = 'dashboard/graph.phtml';
+    protected $_template = 'Magento_Backend::dashboard/graph.phtml';
 
     /**
      * Adminhtml dashboard data
diff --git a/app/code/Magento/Backend/Block/Dashboard/Grid.php b/app/code/Magento/Backend/Block/Dashboard/Grid.php
@@ -17,7 +17,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
     /**
      * @var string
      */
-    protected $_template = 'dashboard/grid.phtml';
+    protected $_template = 'Magento_Backend::dashboard/grid.phtml';
 
     /**
      * Setting default for every grid on dashboard
diff --git a/app/code/Magento/Backend/Block/Dashboard/Sales.php b/app/code/Magento/Backend/Block/Dashboard/Sales.php
@@ -15,7 +15,7 @@ class Sales extends \Magento\Backend\Block\Dashboard\Bar
     /**
      * @var string
      */
-    protected $_template = 'dashboard/salebar.phtml';
+    protected $_template = 'Magento_Backend::dashboard/salebar.phtml';
 
     /**
      * @var \Magento\Framework\Module\Manager
diff --git a/app/code/Magento/Backend/Block/Dashboard/Totals.php b/app/code/Magento/Backend/Block/Dashboard/Totals.php
@@ -16,7 +16,7 @@ class Totals extends \Magento\Backend\Block\Dashboard\Bar
     /**
      * @var string
      */
-    protected $_template = 'dashboard/totalbar.phtml';
+    protected $_template = 'Magento_Backend::dashboard/totalbar.phtml';
 
     /**
      * @var \Magento\Framework\Module\Manager
diff --git a/app/code/Magento/Backend/Block/Page/Copyright.php b/app/code/Magento/Backend/Block/Page/Copyright.php
@@ -18,5 +18,5 @@ class Copyright extends \Magento\Backend\Block\Template
      *
      * @var string
      */
-    protected $_template = 'page/copyright.phtml';
+    protected $_template = 'Magento_Backend::page/copyright.phtml';
 }
diff --git a/app/code/Magento/Backend/Block/Page/Footer.php b/app/code/Magento/Backend/Block/Page/Footer.php
@@ -17,7 +17,7 @@ class Footer extends \Magento\Backend\Block\Template
     /**
      * @var string
      */
-    protected $_template = 'page/footer.phtml';
+    protected $_template = 'Magento_Backend::page/footer.phtml';
 
     /**
      * @var \Magento\Framework\App\ProductMetadataInterface
diff --git a/app/code/Magento/Backend/Block/Page/Header.php b/app/code/Magento/Backend/Block/Page/Header.php
@@ -18,7 +18,7 @@ class Header extends \Magento\Backend\Block\Template
     /**
      * @var string
      */
-    protected $_template = 'page/header.phtml';
+    protected $_template = 'Magento_Backend::page/header.phtml';
 
     /**
      * Backend data
diff --git a/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset.php b/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset.php
@@ -25,7 +25,7 @@ class Fieldset extends \Magento\Backend\Block\Template implements RendererInterf
     /**
      * @var string
      */
-    protected $_template = 'store/switcher/form/renderer/fieldset.phtml';
+    protected $_template = 'Magento_Backend::store/switcher/form/renderer/fieldset.phtml';
 
     /**
      * Retrieve an element
diff --git a/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php b/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php
@@ -23,7 +23,7 @@ class Element extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Eleme
     /**
      * @var string
      */
-    protected $_template = 'store/switcher/form/renderer/fieldset/element.phtml';
+    protected $_template = 'Magento_Backend::store/switcher/form/renderer/fieldset/element.phtml';
 
     /**
      * Retrieve an element
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml
@@ -41,11 +41,11 @@
     <?php endif; ?>
 </div>
 
-<script>
-require(['jquery'], function($){
-        $('.actions-split')
-            .on('click.splitDefault', '.action-default', function() {
-                $(this).siblings('.dropdown-menu').find('.item-default').trigger('click');
-            });
-});
+<script type="text/x-magento-init">
+    {
+        ".actions-split": {
+            "Magento_Ui/js/grid/controls/button/split": {}
+        }
+    }
 </script>
+
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
@@ -1569,7 +1569,7 @@ protected function getEntityPkName(\Magento\Eav\Model\Entity\AbstractEntity $ent
     }
 
     /**
-     * Add requere tax percent flag for product collection
+     * Add require tax percent flag for product collection
      *
      * @return $this
      */
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/category-checkbox-tree.js b/app/code/Magento/Catalog/view/adminhtml/web/js/category-checkbox-tree.js
@@ -32,9 +32,7 @@ define([
             data = {},
             parameters = {},
             root = {},
-            len = 0,
-            key = '',
-            i = 0;
+            key = '';
 
         /* eslint-disable */
         /**
@@ -162,13 +160,14 @@ define([
              * @returns {void}
              */
             categoryLoader.buildCategoryTree = function (parent, config) {// eslint-disable-line no-shadow
+                var i = 0;
 
                 if (!config) {
                     return null;
                 }
 
                 if (parent && config && config.length) {
-                    for (i = 0; i < config.length; i++) {
+                    for (i; i < config.length; i++) {
                         categoryLoader.processCategoryTree(parent, config, i);
                     }
                 }
@@ -181,11 +180,14 @@ define([
              * @returns {Object}
              */
             categoryLoader.buildHashChildren = function (hash, node) {// eslint-disable-line no-shadow
+                var i = 0,
+                    len;
+
                 // eslint-disable-next-line no-extra-parens
                 if ((node.childNodes.length > 0) || (node.loaded === false && node.loading === false)) {
                     hash.children = [];
 
-                    for (i = 0, len = node.childNodes.length; i < len; i++) {
+                    for (i, len = node.childNodes.length; i < len; i++) {
                         /* eslint-disable */
                         if (!hash.children) {
                             hash.children = [];
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/breadcrumbs.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/breadcrumbs.phtml
@@ -11,7 +11,7 @@ $viewModel = $block->getData('viewModel');
     "breadcrumbs": {
         "categoryUrlSuffix": "<?= $block->escapeHtml($viewModel->getCategoryUrlSuffix()); ?>",
         "useCategoryPathInUrl": <?= (int)$viewModel->isCategoryUsedInProductUrl(); ?>,
-        "product": "<?= $block->escapeHtml($block->escapeJsQuote($viewModel->getProductName(), '"')); ?>"
+        "product": "<?= $block->escapeHtml($block->escapeJs($viewModel->getProductName())); ?>"
     }
 }'>
 </div>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
@@ -47,7 +47,7 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
             <?php /** @var $_product \Magento\Catalog\Model\Product */ ?>
             <?php foreach ($_productCollection as $_product): ?>
                 <?= /* @escapeNotVerified */ ($iterator++ == 1) ? '<li class="item product product-item">' : '</li><li class="item product product-item">' ?>
-                <div class="product-item-info" data-container="product-grid">
+                <div class="product-item-info" data-container="product-<?= /* @escapeNotVerified */ $viewMode ?>">
                     <?php
                     $productImage = $block->getImage($_product, $image);
                     if ($pos != null) {
diff --git a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml
@@ -13,8 +13,6 @@
  */
 ?>
 
-<?php $block->getCurrencySymbolsData();?>
-
 <form id="currency-symbols-form" action="<?= /* @escapeNotVerified */ $block->getFormActionUrl() ?>" method="post">
     <input name="form_key" type="hidden" value="<?= /* @escapeNotVerified */ $block->getFormKey() ?>" />
     <fieldset class="admin__fieldset">
diff --git a/app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php b/app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php
@@ -32,6 +32,8 @@ public function execute()
             }
         }
 
-        $this->getResponse()->setRedirect($this->_storeManager->getStore()->getBaseUrl());
+        $resultRedirect = $this->resultRedirectFactory->create();
+        $resultRedirect->setUrl($this->_storeManager->getStore()->getBaseUrl());
+        return $resultRedirect;
     }
 }
diff --git a/app/code/Magento/Paypal/Model/Api/Nvp.php b/app/code/Magento/Paypal/Model/Api/Nvp.php
@@ -846,7 +846,7 @@ public function callGetExpressCheckoutDetails()
         $request = $this->_exportToRequest($this->_getExpressCheckoutDetailsRequest);
         $response = $this->call(self::GET_EXPRESS_CHECKOUT_DETAILS, $request);
         $this->_importFromResponse($this->_paymentInformationResponse, $response);
-        $this->_exportAddressses($response);
+        $this->_exportAddresses($response);
     }
 
     /**
@@ -1463,8 +1463,21 @@ protected function _exportLineItems(array &$request, $i = 0)
      *
      * @param array $data
      * @return void
+     * @deprecated 100.2.2 typo in method name
+     * @see _exportAddresses
      */
     protected function _exportAddressses($data)
+    {
+        $this->_exportAddresses($data);
+    }
+
+    /**
+     * Create billing and shipping addresses basing on response data
+     *
+     * @param array $data
+     * @return void
+     */
+    protected function _exportAddresses($data)
     {
         $address = new \Magento\Framework\DataObject();
         \Magento\Framework\DataObject\Mapper::accumulateByMap($data, $address, $this->_billingAddressMap);
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Discount.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Discount.php
@@ -15,9 +15,9 @@
  */
 class Discount extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTotals
 {
-    //protected $_template = 'tax/checkout/subtotal.phtml';
-
-    //protected $_template = 'tax/checkout/subtotal.phtml';
+    /**
+     * @var \Magento\Tax\Model\Config
+     */
     protected $_taxConfig;
 
     /**
diff --git a/app/code/Magento/Sales/Model/ResourceModel/EntityAbstract.php b/app/code/Magento/Sales/Model/ResourceModel/EntityAbstract.php
@@ -123,10 +123,15 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
         /** @var \Magento\Sales\Model\AbstractModel $object */
         if ($object instanceof EntityInterface && $object->getIncrementId() == null) {
+            $store = $object->getStore();
+            $storeId = $store->getId();
+            if ($storeId === null) {
+                $storeId = $store->getGroup()->getDefaultStoreId();
+            }
             $object->setIncrementId(
                 $this->sequenceManager->getSequence(
                     $object->getEntityType(),
-                    $object->getStore()->getGroup()->getDefaultStoreId()
+                    $storeId
                 )->getNextValue()
             );
         }
diff --git a/app/code/Magento/Tax/Model/Config.php b/app/code/Magento/Tax/Model/Config.php
@@ -832,20 +832,20 @@ public function getInfoUrl($store = null)
      * If it necessary will be returned conversion type (minus or plus)
      *
      * @param null|int|string|Store $store
-     * @return bool
+     * @return bool|int
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function needPriceConversion($store = null)
     {
-        $res = false;
+        $res = 0;
         $priceIncludesTax = $this->priceIncludesTax($store) || $this->getNeedUseShippingExcludeTax();
         if ($priceIncludesTax) {
             switch ($this->getPriceDisplayType($store)) {
                 case self::DISPLAY_TYPE_EXCLUDING_TAX:
                 case self::DISPLAY_TYPE_BOTH:
                     return self::PRICE_CONVERSION_MINUS;
                 case self::DISPLAY_TYPE_INCLUDING_TAX:
-                    $res = true;
+                    $res = false;
                     break;
                 default:
                     break;
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/class/page/edit.phtml b/app/code/Magento/Tax/view/adminhtml/templates/class/page/edit.phtml
@@ -11,10 +11,10 @@
     <?= $block->getSaveButtonHtml() ?>
 </div>
 <?= $block->getRenameFormHtml() ?>
-<script>
-require(['jquery', "mage/mage"], function(jQuery){
-
-    jQuery('#<?= /* @escapeNotVerified */ $block->getRenameFormId() ?>').mage('form').mage('validation');
-
-});
+<script type="text/x-magento-init">
+    {
+        "#<?= /* @escapeNotVerified */ $block->getRenameFormId() ?>": {
+            "Magento_Tax/js/page/validate": {}
+        }
+    }
 </script>
diff --git a/app/code/Magento/Tax/view/adminhtml/web/js/page/validate.js b/app/code/Magento/Tax/view/adminhtml/web/js/page/validate.js
@@ -0,0 +1,15 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'mage/mage'
+], function (jQuery) {
+    'use strict';
+
+    return function (data, element) {
+        jQuery(element).mage('form').mage('validation');
+    };
+});
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js b/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js
@@ -220,7 +220,7 @@ define([
         },
 
         /**
-         * Sets 'value' as 'hidden' propertie's value, triggers 'toggle' event,
+         * Sets 'value' as 'hidden' property's value, triggers 'toggle' event,
          * sets instance's hidden identifier in params storage based on
          * 'value'.
          *
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less
diff --git a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
diff --git a/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php b/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php

Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,5 @@ class Copyright extends \Magento\Backend\Block\Template`
`18`	`18`	`*`
`19`	`19`	`* @var string`
`20`	`20`	`*/`
`21`		`- protected $_template = 'page/copyright.phtml';`
	`21`	`+ protected $_template = 'Magento_Backend::page/copyright.phtml';`
`22`	`22`	`}`