🔃 [EngCom] Public Pull Requests - 2.3-develop

Accepted Public Pull Requests:
 - #16481: Declare module namespace before template path name(Magento_Sales::order/creditmemo.phtml). (by @Sarvesh-A)
 - #16476: [Forwardport] Declare module namespace before template path name(Magento_Sales::order/info.phtml). (by @gelanivishal)
 - #16462: 2.3 develop (by @rsantellan)
 - #16429: [Forwardport] Fix for #8222 (by @0m3r)
 - #15592: Use the timeout when querying Elasticsearch (by @mpchadwick)


Fixed GitHub Issues:
 - #8222: Estimate Shipping and Tax Form not works due to js error in collapsible.js [proposed fix] (reported by @Dart18) has been fixed in #16429 by @0m3r in 2.3-develop branch
   Related commits:
     1. 59a80fd

Author: magento-engcom-team

app/code/Magento/Elasticsearch/Model/Client/Elasticsearch.php

@@ -293,7 +293,8 @@ public function deleteMapping($index, $entityType)
      */
     public function query($query)
     {
-        return $this->client->search($query);
+        $params = array_merge($query, ['client' => ['timeout' => $this->clientOptions['timeout']]]);
+        return $this->client->search($params);
     }
 
     /**

app/code/Magento/Sales/Block/Order/Creditmemo.php

@@ -19,7 +19,7 @@ class Creditmemo extends \Magento\Sales\Block\Order\Creditmemo\Items
     /**
      * @var string
      */
-    protected $_template = 'order/creditmemo.phtml';
+    protected $_template = 'Magento_Sales::order/creditmemo.phtml';
 
     /**
      * @var \Magento\Framework\App\Http\Context

app/code/Magento/Sales/Block/Order/Info.php

@@ -23,7 +23,7 @@ class Info extends \Magento\Framework\View\Element\Template
     /**
      * @var string
      */
-    protected $_template = 'order/info.phtml';
+    protected $_template = 'Magento_Sales::order/info.phtml';
 
     /**
      * Core registry

app/code/Magento/SalesRule/view/frontend/web/js/view/summary/discount.js

@@ -57,7 +57,7 @@ define([
             }
 
             discountSegments = this.totals()['total_segments'].filter(function (segment) {
-                return segment.code === 'discount';
+                return segment.code.indexOf('discount') !== -1;
             });
 
             return discountSegments.length ? discountSegments[0].title : null;

lib/web/mage/collapsible.js

@@ -110,7 +110,7 @@ define([
         _processState: function () {
             var anchor = window.location.hash,
                 isValid = $.mage.isValidSelector(anchor),
-                urlPath = window.location.pathname.replace('.', ''),
+                urlPath = window.location.pathname.replace(/\./g, ''),
                 state;
 
             this.stateKey = encodeURIComponent(urlPath + this.element.attr('id'));