🔃 [EngCom] Public Pull Requests - 2.3-develop

Accepted Public Pull Requests:
 - #15134: [Forwardport] [TASK] Fix overriding of payment methods in getPaymentMethodList (by @mzeis)
 - #15142: [Forwardport] Changed the length of the remote_ip field to store ipv6 addresses (by @dmytro-ch)
 - #15095: [Forwardport] Fix reset password link with appropriate customer store (by @rogyar)
 - #15080: [Forwardport] Renamed "Add Block Names to Hints" config setting to represent what it actually does (by @adrian-martinez-interactiv4)
 - #15079: [Forwardport] Change 'Update'-button visibility on change qty event. (by @adrian-martinez-interactiv4)
 - #15074: [Forwardport] Fixed issue products grid operations in admin cart price rule edit page for user which has no access to CatalogRule module (by @adrian-martinez-interactiv4)
 - #15077: [Forwardport] FIX for issue#14855 - Adding an * to do a customer search (by @adrian-martinez-interactiv4)
 - #15072: [Forwardport] Fix infinite checkout loader when some script wasn't loaded correctly because of network error (by @adrian-martinez-interactiv4)


Fixed GitHub Issues:
 - #13460: Allmethods config source model does not always report the full list of payment methods (reported by @moehrenzahn) has been fixed in #15134 by @mzeis in 2.3-develop branch
   Related commits:
     1. 971e303

 - #10395: REMOTE_IP gets saved partially when using IPV6 (reported by @keevitaja) has been fixed in #15142 by @dmytro-ch in 2.3-develop branch
   Related commits:
     1. 41a99e1

 - #5726: Reset Password Email Issue on Multi Store from Admin (reported by @ngashokkumar) has been fixed in #15095 by @rogyar in 2.3-develop branch
   Related commits:
     1. 1e8ce46
     2. a267e2f
     3. 407c930

 - #14855: Adding an * to do a customer search. (reported by @taylored2) has been fixed in #15077 by @adrian-martinez-interactiv4 in 2.3-develop branch
   Related commits:
     1. 01b546f

Author: magento-engcom-team

app/code/Magento/Backend/etc/adminhtml/system.xml

@@ -136,7 +136,7 @@
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
                 <field id="template_hints_blocks" translate="label" type="select" sortOrder="21" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Add Block Names to Hints</label>
+                    <label>Add Block Class Type to Hints</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
             </group>

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/Checkout/view/frontend/web/js/sidebar.js

@@ -105,6 +105,13 @@ define([
                 self._showItemButton($(event.target));
             };
 
+            /**
+             * @param {jQuery.Event} event
+             */
+            events['change ' + this.options.item.qty] = function (event) {
+                self._showItemButton($(event.target));
+            };
+
             /**
              * @param {jQuery.Event} event
              */

app/code/Magento/Customer/Model/EmailNotification.php

@@ -314,9 +314,9 @@ private function getWebsiteStoreId($customer, $defaultStoreId = null)
      */
     public function passwordReminder(CustomerInterface $customer)
     {
-        $storeId = $this->getWebsiteStoreId($customer);
+        $storeId = $customer->getStoreId();
         if (!$storeId) {
-            $storeId = $this->storeManager->getStore()->getId();
+            $storeId = $this->getWebsiteStoreId($customer);
         }
 
         $customerEmailData = $this->getFullCustomerObject($customer);

app/code/Magento/Customer/Test/Unit/Model/EmailNotificationTest.php

@@ -312,13 +312,15 @@ public function sendNotificationEmailsDataProvider()
     public function testPasswordReminder()
     {
         $customerId = 1;
+        $customerWebsiteId = 1;
         $customerStoreId = 2;
         $customerEmail = '[email protected]';
         $customerData = ['key' => 'value'];
         $customerName = 'Customer Name';
         $templateIdentifier = 'Template Identifier';
         $sender = 'Sender';
         $senderValues = ['name' => $sender, 'email' => $sender];
+        $storeIds = [1, 2];
 
         $this->senderResolverMock
             ->expects($this->once())
@@ -328,6 +330,9 @@ public function testPasswordReminder()
 
         /** @var CustomerInterface|\PHPUnit_Framework_MockObject_MockObject $customer */
         $customer = $this->createMock(CustomerInterface::class);
+        $customer->expects($this->any())
+            ->method('getWebsiteId')
+            ->willReturn($customerWebsiteId);
         $customer->expects($this->any())
             ->method('getStoreId')
             ->willReturn($customerStoreId);
@@ -346,10 +351,15 @@ public function testPasswordReminder()
             ->method('getStore')
             ->willReturn($this->storeMock);
 
-        $this->storeManagerMock->expects($this->at(1))
-            ->method('getStore')
-            ->with($customerStoreId)
-            ->willReturn($this->storeMock);
+        $websiteMock = $this->createPartialMock(\Magento\Store\Model\Website::class, ['getStoreIds']);
+        $websiteMock->expects($this->any())
+            ->method('getStoreIds')
+            ->willReturn($storeIds);
+
+        $this->storeManagerMock->expects($this->any())
+            ->method('getWebsite')
+            ->with($customerWebsiteId)
+            ->willReturn($websiteMock);
 
         $this->customerRegistryMock->expects($this->once())
             ->method('retrieveSecureData')
@@ -396,6 +406,99 @@ public function testPasswordReminder()
         $this->model->passwordReminder($customer);
     }
 
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testPasswordReminderCustomerWithoutStoreId()
+    {
+        $customerId = 1;
+        $customerWebsiteId = 1;
+        $customerStoreId = null;
+        $customerEmail = '[email protected]';
+        $customerData = ['key' => 'value'];
+        $customerName = 'Customer Name';
+        $templateIdentifier = 'Template Identifier';
+        $sender = 'Sender';
+        $senderValues = ['name' => $sender, 'email' => $sender];
+        $storeIds = [1, 2];
+        $defaultStoreId = reset($storeIds);
+        $this->senderResolverMock
+            ->expects($this->once())
+            ->method('resolve')
+            ->with($sender, $defaultStoreId)
+            ->willReturn($senderValues);
+        /** @var CustomerInterface | \PHPUnit_Framework_MockObject_MockObject $customer */
+        $customer = $this->createMock(CustomerInterface::class);
+        $customer->expects($this->any())
+            ->method('getWebsiteId')
+            ->willReturn($customerWebsiteId);
+        $customer->expects($this->any())
+            ->method('getStoreId')
+            ->willReturn($customerStoreId);
+        $customer->expects($this->any())
+            ->method('getId')
+            ->willReturn($customerId);
+        $customer->expects($this->any())
+            ->method('getEmail')
+            ->willReturn($customerEmail);
+        $this->storeMock->expects($this->any())
+            ->method('getId')
+            ->willReturn($defaultStoreId);
+        $this->storeManagerMock->expects($this->at(0))
+            ->method('getStore')
+            ->willReturn($this->storeMock);
+        $this->storeManagerMock->expects($this->at(1))
+            ->method('getStore')
+            ->with($defaultStoreId)
+            ->willReturn($this->storeMock);
+        $websiteMock = $this->createPartialMock(\Magento\Store\Model\Website::class, ['getStoreIds']);
+        $websiteMock->expects($this->any())
+            ->method('getStoreIds')
+            ->willReturn($storeIds);
+        $this->storeManagerMock->expects($this->any())
+            ->method('getWebsite')
+            ->with($customerWebsiteId)
+            ->willReturn($websiteMock);
+
+        $this->customerRegistryMock->expects($this->once())
+            ->method('retrieveSecureData')
+            ->with($customerId)
+            ->willReturn($this->customerSecureMock);
+        $this->dataProcessorMock->expects($this->once())
+            ->method('buildOutputDataArray')
+            ->with($customer, CustomerInterface::class)
+            ->willReturn($customerData);
+        $this->customerViewHelperMock->expects($this->any())
+            ->method('getCustomerName')
+            ->with($customer)
+            ->willReturn($customerName);
+        $this->customerSecureMock->expects($this->once())
+            ->method('addData')
+            ->with($customerData)
+            ->willReturnSelf();
+        $this->customerSecureMock->expects($this->once())
+            ->method('setData')
+            ->with('name', $customerName)
+            ->willReturnSelf();
+        $this->scopeConfigMock->expects($this->at(0))
+            ->method('getValue')
+            ->with(EmailNotification::XML_PATH_REMIND_EMAIL_TEMPLATE, ScopeInterface::SCOPE_STORE, $defaultStoreId)
+            ->willReturn($templateIdentifier);
+        $this->scopeConfigMock->expects($this->at(1))
+            ->method('getValue')
+            ->with(EmailNotification::XML_PATH_FORGOT_EMAIL_IDENTITY, ScopeInterface::SCOPE_STORE, $defaultStoreId)
+            ->willReturn($sender);
+        $this->mockDefaultTransportBuilder(
+            $templateIdentifier,
+            $defaultStoreId,
+            $senderValues,
+            $customerEmail,
+            $customerName,
+            ['customer' => $this->customerSecureMock, 'store' => $this->storeMock]
+        );
+        $this->model->passwordReminder($customer);
+    }
+
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */

app/code/Magento/Payment/Helper/Data.php

@@ -293,7 +293,9 @@ public function getPaymentMethodList($sorted = true, $asLabelValue = false, $wit
             foreach ($methods as $code => $title) {
                 if (isset($groups[$code])) {
                     $labelValues[$code]['label'] = $title;
-                    $labelValues[$code]['value'] = null;
+                    if (!isset($labelValues[$code]['value'])) {
+                        $labelValues[$code]['value'] = null;
+                    }
                 } elseif (isset($groupRelations[$code])) {
                     unset($labelValues[$code]);
                     $labelValues[$groupRelations[$code]]['value'][$code] = ['value' => $code, 'label' => $title];

app/code/Magento/Quote/etc/db_schema.xml

@@ -61,7 +61,7 @@
                 identity="false" default="1" comment="Customer Note Notify"/>
         <column xsi:type="smallint" name="customer_is_guest" padding="5" unsigned="true" nullable="true"
                 identity="false" default="0" comment="Customer Is Guest"/>
-        <column xsi:type="varchar" name="remote_ip" nullable="true" length="32" comment="Remote Ip"/>
+        <column xsi:type="varchar" name="remote_ip" nullable="true" length="45" comment="Remote Ip"/>
         <column xsi:type="varchar" name="applied_rule_ids" nullable="true" length="255" comment="Applied Rule Ids"/>
         <column xsi:type="varchar" name="reserved_order_id" nullable="true" length="64" comment="Reserved Order Id"/>
         <column xsi:type="varchar" name="password_hash" nullable="true" length="255" comment="Password Hash"/>

app/code/Magento/Sales/etc/db_schema.xml

@@ -216,7 +216,7 @@
         <column xsi:type="varchar" name="relation_parent_id" nullable="true" length="32" comment="Relation Parent Id"/>
         <column xsi:type="varchar" name="relation_parent_real_id" nullable="true" length="32"
                 comment="Relation Parent Real Id"/>
-        <column xsi:type="varchar" name="remote_ip" nullable="true" length="32" comment="Remote Ip"/>
+        <column xsi:type="varchar" name="remote_ip" nullable="true" length="45" comment="Remote Ip"/>
         <column xsi:type="varchar" name="shipping_method" nullable="true" length="120"/>
         <column xsi:type="varchar" name="store_currency_code" nullable="true" length="3" comment="Store Currency Code"/>
         <column xsi:type="varchar" name="store_name" nullable="true" length="32" comment="Store Name"/>

lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FulltextFilter.php

@@ -62,6 +62,16 @@ function ($column) use ($alias) {
         return $columns;
     }
 
+    /**
+     * Escape against value
+     * @param string $value
+     * @return string
+     */
+    private function escapeAgainstValue(string $value): string
+    {
+        return preg_replace('/([+\-><\(\)~*\"@]+)/', ' ', $value);
+    }
+
     /**
      * Apply fulltext filters
      *
@@ -86,7 +96,7 @@ public function apply(Collection $collection, Filter $filter)
         $collection->getSelect()
             ->where(
                 'MATCH(' . implode(',', $columns) . ') AGAINST(?)',
-                $filter->getValue()
+                $this->escapeAgainstValue($filter->getValue())
             );
     }
 }

lib/web/mage/requirejs/resolver.js

@@ -27,14 +27,28 @@ define([
         return !!_.findWhere(callbacks, callback);
     }
 
+    /**
+     * Checks if provided module is rejected during load.
+     *
+     * @param {Object} module - Module to be checked.
+     * @return {Boolean}
+     */
+    function isRejected(module) {
+        return registry[module.id] && registry[module.id].error;
+    }
+
     /**
      * Checks if provided module has unresolved dependencies.
      *
      * @param {Object} module - Module to be checked.
      * @returns {Boolean}
      */
     function isPending(module) {
-        return !!module.depCount;
+        if (!module.depCount) {
+            return false;
+        }
+
+        return module.depCount > _.filter(module.depMaps, isRejected).length;
     }
 
     /**