Merge remote-tracking branch 'magento-mpi/MC-21467' into MPI-PR

Author: arnobsh

app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml

@@ -170,6 +170,9 @@ $numColumns = $block->getColumns() !== null ? count($block->getColumns()) : 0;
         <?php if ($block->getSortableUpdateCallback()) : ?>
                 <?= $block->escapeJs($block->getJsObjectName()) ?>.sortableUpdateCallback = <?= /* @noEscape */ $block->getSortableUpdateCallback() ?>;
         <?php endif; ?>
+        <?php if ($block->getFilterKeyPressCallback()) : ?>
+            <?= $block->escapeJs($block->getJsObjectName()) ?>.filterKeyPressCallback = <?= /* @noEscape */ $block->getFilterKeyPressCallback() ?>;
+        <?php endif; ?>
         <?= $block->escapeJs($block->getJsObjectName()) ?>.bindSortable();
         <?php if ($block->getRowInitCallback()) : ?>
                 <?= $block->escapeJs($block->getJsObjectName()) ?>.initRowCallback = <?= /* @noEscape */ $block->getRowInitCallback() ?>;

app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml

@@ -272,6 +272,9 @@ $numColumns = count($block->getColumns());
         <?php if ($block->getCheckboxCheckCallback()) : ?>
             <?= $block->escapeJs($block->getJsObjectName()) ?>.checkboxCheckCallback = <?= /* @noEscape */ $block->getCheckboxCheckCallback() ?>;
         <?php endif; ?>
+        <?php if ($block->getFilterKeyPressCallback()) : ?>
+            <?= $block->escapeJs($block->getJsObjectName()) ?>.filterKeyPressCallback = <?= /* @noEscape */ $block->getFilterKeyPressCallback() ?>;
+        <?php endif; ?>
         <?php if ($block->getRowInitCallback()) : ?>
             <?= $block->escapeJs($block->getJsObjectName()) ?>.initRowCallback = <?= /* @noEscape */ $block->getRowInitCallback() ?>;
             <?= $block->escapeJs($block->getJsObjectName()) ?>.initGridRows();

app/code/Magento/Braintree/Gateway/Validator/ErrorCodeProvider.php

@@ -11,6 +11,7 @@
 use Braintree\Error\Validation;
 use Braintree\Result\Error;
 use Braintree\Result\Successful;
+use Braintree\Transaction;
 
 /**
  * Processes errors codes from Braintree response.
@@ -38,12 +39,14 @@ public function getErrorCodes($response): array
             $result[] = $error->code;
         }
 
-        if (isset($response->transaction) && $response->transaction->status === 'gateway_rejected') {
-            $result[] = $response->transaction->gatewayRejectionReason;
-        }
+        if (isset($response->transaction) && $response->transaction) {
+            if ($response->transaction->status === Transaction::GATEWAY_REJECTED) {
+                $result[] = $response->transaction->gatewayRejectionReason;
+            }
 
-        if (isset($response->transaction) && $response->transaction->status === 'processor_declined') {
-            $result[] = $response->transaction->processorResponseCode;
+            if ($response->transaction->status === Transaction::PROCESSOR_DECLINED) {
+                $result[] = $response->transaction->processorResponseCode;
+            }
         }
 
         return $result;

app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php

@@ -5,8 +5,7 @@
  */
 namespace Magento\Sales\Block\Adminhtml\Order\Create\Search;
 
-use Magento\Sales\Block\Adminhtml\Order\Create\Search\Grid\DataProvider\ProductCollection
-    as ProductCollectionDataProvider;
+use Magento\Sales\Block\Adminhtml\Order\Create\Search\Grid\DataProvider\ProductCollection;
 use Magento\Framework\App\ObjectManager;
 
 /**
@@ -48,7 +47,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
     protected $_productFactory;
 
     /**
-     * @var ProductCollectionDataProvider $productCollectionProvider
+     * @var ProductCollection $productCollectionProvider
      */
     private $productCollectionProvider;
 
@@ -60,7 +59,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      * @param \Magento\Backend\Model\Session\Quote $sessionQuote
      * @param \Magento\Sales\Model\Config $salesConfig
      * @param array $data
-     * @param ProductCollectionDataProvider|null $productCollectionProvider
+     * @param ProductCollection|null $productCollectionProvider
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -70,14 +69,14 @@ public function __construct(
         \Magento\Backend\Model\Session\Quote $sessionQuote,
         \Magento\Sales\Model\Config $salesConfig,
         array $data = [],
-        ProductCollectionDataProvider $productCollectionProvider = null
+        ProductCollection $productCollectionProvider = null
     ) {
         $this->_productFactory = $productFactory;
         $this->_catalogConfig = $catalogConfig;
         $this->_sessionQuote = $sessionQuote;
         $this->_salesConfig = $salesConfig;
         $this->productCollectionProvider = $productCollectionProvider
-            ?: ObjectManager::getInstance()->get(ProductCollectionDataProvider::class);
+            ?: ObjectManager::getInstance()->get(ProductCollection::class);
         parent::__construct($context, $backendHelper, $data);
     }
 
@@ -94,6 +93,7 @@ protected function _construct()
         $this->setCheckboxCheckCallback('order.productGridCheckboxCheck.bind(order)');
         $this->setRowInitCallback('order.productGridRowInit.bind(order)');
         $this->setDefaultSort('entity_id');
+        $this->setFilterKeyPressCallback('order.productGridFilterKeyPress');
         $this->setUseAjax(true);
         if ($this->getRequest()->getParam('collapse')) {
             $this->setIsCollapsed(true);

app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js

@@ -795,6 +795,20 @@ define([
             grid.reloadParams = {'products[]':this.gridProducts.keys()};
         },
 
+        productGridFilterKeyPress: function (grid, event) {
+            var returnKey = parseInt(Event.KEY_RETURN || 13, 10);
+
+            if (event.keyCode === returnKey) {
+                if (typeof event.stopPropagation === 'function') {
+                    event.stopPropagation();
+                }
+
+                if (typeof event.preventDefault === 'function') {
+                    event.preventDefault();
+                }
+            }
+        },
+
         /**
          * Submit configured products to quote
          */

lib/web/mage/adminhtml/grid.js

@@ -63,6 +63,7 @@ define([
             this.initRowCallback = false;
             this.doFilterCallback = false;
             this.sortableUpdateCallback = false;
+            this.filterKeyPressCallback = false;
 
             this.reloadParams = false;
 
@@ -511,6 +512,10 @@ define([
             if (event.keyCode == Event.KEY_RETURN) { //eslint-disable-line eqeqeq
                 this.doFilter();
             }
+
+            if (this.filterKeyPressCallback) {
+                this.filterKeyPressCallback(this, event);
+            }
         },
 
         /**