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

Author: Oleksandr Iegorov

app/code/Magento/Backend/Block/GlobalSearch.php

@@ -73,6 +73,7 @@ public function getWidgetInitOptions()
                 'filterProperty' => 'name',
                 'preventClickPropagation' => false,
                 'minLength' => 2,
+                'submitInputOnEnter' => false,
             ]
         ];
     }

app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Widget/Chooser/Sku.php

@@ -207,7 +207,7 @@ protected function _prepareColumns()
     public function getGridUrl()
     {
         return $this->getUrl(
-            'catalog_rule/*/chooser',
+            '*/*/chooser',
             ['_current' => true, 'current_grid_id' => $this->getId(), 'collapse' => null]
         );
     }

app/code/Magento/CatalogSearch/Ui/DataProvider/Product/AddFulltextFilterToCollection.php

@@ -11,7 +11,7 @@
 use Magento\Ui\DataProvider\AddFilterToCollectionInterface;
 
 /**
- * Class AddFulltextFilterToCollection
+ * Adds FullText search to Product Data Provider
  */
 class AddFulltextFilterToCollection implements AddFilterToCollectionInterface
 {

app/code/Magento/Paypal/Model/Express/Checkout.php

@@ -809,7 +809,9 @@ public function place($token, $shippingMethodCode = null)
             case \Magento\Sales\Model\Order::STATE_PROCESSING:
             case \Magento\Sales\Model\Order::STATE_COMPLETE:
             case \Magento\Sales\Model\Order::STATE_PAYMENT_REVIEW:
-                $this->orderSender->send($order);
+                if (!$order->getEmailSent()) {
+                    $this->orderSender->send($order);
+                }
                 $this->_checkoutSession->start();
                 break;
             default:

app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php

@@ -45,6 +45,11 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionContro
      */
     protected $_quoteConfig;
 
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface|null
+     */
+    private $storeManager;
+
     /**
      * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
      * @param \Psr\Log\LoggerInterface $logger
@@ -56,6 +61,7 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionContro
      * @param \Magento\Quote\Model\Quote\Config $quoteConfig
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
+     * @param \Magento\Store\Model\StoreManagerInterface|null $storeManager
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -68,7 +74,8 @@ public function __construct(
         \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory,
         \Magento\Quote\Model\Quote\Config $quoteConfig,
         \Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
-        \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null
+        \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null,
+        \Magento\Store\Model\StoreManagerInterface $storeManager = null
     ) {
         parent::__construct(
             $entityFactory,
@@ -82,6 +89,10 @@ public function __construct(
         $this->_itemOptionCollectionFactory = $itemOptionCollectionFactory;
         $this->_productCollectionFactory = $productCollectionFactory;
         $this->_quoteConfig = $quoteConfig;
+
+        // Backward compatibility constructor parameters
+        $this->storeManager = $storeManager ?:
+            \Magento\Framework\App\ObjectManager::getInstance()->get(\Magento\Store\Model\StoreManagerInterface::class);
     }
 
     /**
@@ -101,7 +112,10 @@ protected function _construct()
      */
     public function getStoreId()
     {
-        return (int)$this->_productCollectionFactory->create()->getStoreId();
+        // Fallback to current storeId if no quote is provided
+        // (see https://github.com/magento/magento2/commit/9d3be732a88884a66d667b443b3dc1655ddd0721)
+        return $this->_quote === null ?
+            (int) $this->storeManager->getStore()->getId() : (int) $this->_quote->getStoreId();
     }
 
     /**

app/code/Magento/Review/view/frontend/templates/view.phtml

@@ -49,7 +49,7 @@
     <div class="actions">
         <div class="secondary">
             <a class="action back" href="<?= $block->escapeUrl($block->getBackUrl()) ?>">
-                <span><?= $block->escapeHtml(__('Back to Product Reviews')) ?></a></span>
+                <span><?= $block->escapeHtml(__('Back to Product Reviews')) ?></span>
             </a>
         </div>
     </div>

app/code/Magento/Search/Model/SynonymAnalyzer.php

@@ -82,7 +82,7 @@ public function getSynonymsForPhrase($phrase)
     /**
      * Helper method to find the matching of $pattern to $synonymGroupsToExamine.
      * If matches, the particular array index is returned.
-     * Otherwise false will be returned.
+     * Otherwise null will be returned.
      *
      * @param string $pattern
      * @param array $synonymGroupsToExamine

lib/web/mage/backend/suggest.js

@@ -65,7 +65,8 @@
             inputWrapper: '<div class="mage-suggest"><div class="mage-suggest-inner"></div></div>',
             dropdownWrapper: '<div class="mage-suggest-dropdown"></div>',
             preventClickPropagation: true,
-            currentlySelected: null
+            currentlySelected: null,
+            submitInputOnEnter: true
         },
 
         /**
@@ -79,7 +80,6 @@
                 label: ''
             };
             this.templates = {};
-
             this._renderedContext = null;
             this._selectedItem = this._nonSelectedItem;
             this._control = this.options.controls || {};
@@ -312,18 +312,23 @@
                 click: this.search
             }, this.options.events));
 
+            this._bindSubmit();
             this._bindDropdown();
         },
 
         /**
-         * @param {Object} event - event object
+         * @param {Object} event
          * @private
          */
         _toggleEnter: function (event) {
             var suggestList,
                 activeItems,
                 selectedItem;
 
+            if (!this.options.submitInputOnEnter) {
+                event.preventDefault();
+            }
+
             suggestList = $(event.currentTarget.parentNode).find('ul').first();
             activeItems = suggestList.find('._active');
 
@@ -333,12 +338,22 @@
                 if (selectedItem.find('a') && selectedItem.find('a').attr('href') !== undefined) {
                     window.location = selectedItem.find('a').attr('href');
                     event.preventDefault();
-
-                    return false;
                 }
             }
         },
 
+        /**
+         * Bind handlers for submit on enter
+         * @private
+         */
+        _bindSubmit: function () {
+            this.element.parents('form').on('submit', function (event) {
+                if (!this.submitInputOnEnter) {
+                    event.preventDefault();
+                }
+            });
+        },
+
         /**
          * @param {Object} e - event object
          * @private
@@ -465,8 +480,8 @@
             }
 
             if (this._trigger('beforeselect', e || null, {
-                item: this._focused
-            }) === false) {
+                    item: this._focused
+                }) === false) {
                 return;
             }
             this._selectItem(e);
@@ -701,9 +716,6 @@
             if ($.isArray(o.source)) {
                 response(this.filter(o.source, term));
             } else if ($.type(o.source) === 'string') {
-                if (this._xhr) {
-                    this._xhr.abort();
-                }
                 ajaxData = {};
                 ajaxData[this.options.termAjaxArgument] = term;
 
@@ -729,10 +741,6 @@
         _abortSearch: function () {
             this.element.removeClass(this.options.loadingClass);
             clearTimeout(this._searchTimeout);
-
-            if (this._xhr) {
-                this._xhr.abort();
-            }
         },
 
         /**
@@ -905,8 +913,8 @@
                 '<li class="mage-suggest-search-field" data-role="parent-choice-element"><' +
                 'label class="mage-suggest-search-label"></label></li></ul>',
             choiceTemplate: '<li class="mage-suggest-choice button"><div><%- text %></div>' +
-                '<span class="mage-suggest-choice-close" tabindex="-1" ' +
-                'data-mage-init=\'{"actionLink":{"event":"removeOption"}}\'></span></li>',
+            '<span class="mage-suggest-choice-close" tabindex="-1" ' +
+            'data-mage-init=\'{"actionLink":{"event":"removeOption"}}\'></span></li>',
             selectedClass: 'mage-suggest-selected'
         },