🔃 [EngCom] Public Pull Requests - 2.3-develop

Accepted Public Pull Requests:
 - #16893: [Forwardport] FIX for issue#14869 - Wrong price at backend after update (by @mage2pratik)
 - #17020: [Forwardport] hide cookie notice instead of reloading site (by @torhoehn)
 - #17014: [Forwardport] Fixes white color coding standard. (by @chirag-wagento)
 - #17016: [Forwardport] Avoid undefined index warning when using uppercase reserved word (by @FreekVandeursen)
 - #17017: [Forwardport] Wrong namespace defined in compare.phtml (by @ronak2ram)
 - #16997: [Forwardport] Corrected Magento_Framework's test xml file. (by @ihor-sviziev)
 - #16996: [Forwardport] Updated Magento_Newsletter's block file. (by @ihor-sviziev)
 - #16994: [Forwardport] Responsive Design Footers bottom of screen on mobile devices #15118 (by @ihor-sviziev)
 - #16993: [Forwardport] FIXED - appended payment code to ID field to make it unique (by @ihor-sviziev)
 - #16998: [Forwardport] Added 'title' attribute to 'a' link. (by @ihor-sviziev)
 - #16973: [Forwardport] Removed double occurrence of  keywords in sentences. (by @gelanivishal)
 - magento/graphql-ce#126: 120 implement store configs coverage (by @VitaliyBoyko)
 - magento/graphql-ce#99: #96 Make category query compatible with staging (by @roma-glushko)
 - #16734: [forwardport] #16559 fix icon color variable naming  (by @Karlasa)


Fixed GitHub Issues:
 - #14869: M 2.2.3 price per website - wrong price at backend by a create order after update (reported by @Webroju) has been fixed in #16893 by @mage2pratik in 2.3-develop branch
   Related commits:
     1. 49926d7
     2. 35b968e

 - #15118: Responsive Design, Footers do not snap to bottom of screen on mobile devices (reported by @gwharton) has been fixed in #16994 by @ihor-sviziev in 2.3-develop branch
   Related commits:
     1. f7228d0

 - #13692: In payment step of checkout I cannot unselect #billing-save-in-address-book checkbox in non-first payment method (reported by @NeosKnowledgeBasePluswerk) has been fixed in #16993 by @ihor-sviziev in 2.3-develop branch
   Related commits:
     1. a659f4b

 - #120: Default trigger coupon via URL (reported by @seansan) has been fixed in magento/graphql-ce#126 by @VitaliyBoyko in 2.3-develop branch
   Related commits:
     1. e1f53d4
     2. 5229cd6
     3. af4b258
     4. 3b64955
     5. b5a2a98
     6. e85a6e5
     7. 8f3c6e9

Author: Stanislav Idolov

CHANGELOG.md

@@ -1977,7 +1977,7 @@ Tests:
     * [#686](https://github.com/magento/magento2/issues/686) -- Product save validation errors in the admin don't hide the overlay
     * [#702](https://github.com/magento/magento2/issues/702) -- Base table or view not found
     * [#652](https://github.com/magento/magento2/issues/652) -- Multishipping checkout not to change the Billing address js issue
-    * [#648](https://github.com/magento/magento2/issues/648) -- An equal (=) sign in the hash of the product page to to break the tabs functionality
+    * [#648](https://github.com/magento/magento2/issues/648) -- An equal (=) sign in the hash of the product page to break the tabs functionality
 * Service Contracts:
     * Refactored usage of new API of the Customer module
     * Implemented Service Contracts for the Sales module

app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml

@@ -17,7 +17,7 @@
             <?= /* @escapeNotVerified */ $edition ?>
             class="logo">
             <img class="logo-img" src="<?= /* @escapeNotVerified */ $block->getViewFileUrl($logoSrc) ?>"
-            alt="<?= $block->escapeHtml(__('Magento Admin Panel')) ?>"/>
+            alt="<?= $block->escapeHtml(__('Magento Admin Panel')) ?>" title="<?= $block->escapeHtml(__('Magento Admin Panel')) ?>"/>
         </a>
     <?php break; ?>
     <?php case 'user': ?>

app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml

@@ -34,7 +34,7 @@
         <?php foreach ($block->getValues()->getAttributeBackend()->getImageTypes() as $type): ?>
             <td class="gallery" align="center" style="vertical-align:bottom;">
             <a href="<?= /* @escapeNotVerified */ $image->setType($type)->getSourceUrl() ?>" target="_blank" onclick="imagePreview('<?= $block->getElement()->getHtmlId() ?>_image_<?= /* @escapeNotVerified */ $type ?>_<?= /* @escapeNotVerified */ $image->getValueId() ?>');return false;">
-            <img id="<?= $block->getElement()->getHtmlId() ?>_image_<?= /* @escapeNotVerified */ $type ?>_<?= /* @escapeNotVerified */ $image->getValueId() ?>" src="<?= /* @escapeNotVerified */ $image->setType($type)->getSourceUrl() ?>?<?= /* @escapeNotVerified */ time() ?>" alt="<?= /* @escapeNotVerified */ $image->getValue() ?>" height="25" class="small-image-preview v-middle"/></a><br/>
+            <img id="<?= $block->getElement()->getHtmlId() ?>_image_<?= /* @escapeNotVerified */ $type ?>_<?= /* @escapeNotVerified */ $image->getValueId() ?>" src="<?= /* @escapeNotVerified */ $image->setType($type)->getSourceUrl() ?>?<?= /* @escapeNotVerified */ time() ?>" alt="<?= /* @escapeNotVerified */ $image->getValue() ?>" title="<?= /* @escapeNotVerified */ $image->getValue() ?>" height="25" class="small-image-preview v-middle"/></a><br/>
             <input type="file" name="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>_<?= /* @escapeNotVerified */ $type ?>[<?= /* @escapeNotVerified */ $image->getValueId() ?>]" size="1"></td>
         <?php endforeach; ?>
         <td class="gallery" align="center" style="vertical-align:bottom;"><input type="input" name="<?= /* @escapeNotVerified */ $block->getElement()->getParentName() ?>[position][<?= /* @escapeNotVerified */ $image->getValueId() ?>]" value="<?= /* @escapeNotVerified */ $image->getPosition() ?>" id="<?= $block->getElement()->getHtmlId() ?>_position_<?= /* @escapeNotVerified */ $image->getValueId() ?>" size="3"/></td>

app/code/Magento/Catalog/view/frontend/templates/product/view/addto/compare.phtml

@@ -6,7 +6,7 @@
 
 // @codingStandardsIgnoreFile
 
-/** @var $block \Magento\Catalog\Block\Catalog\Product\View\Addto\Compare */
+/** @var $block \Magento\Catalog\Block\Product\View\Addto\Compare */
 ?>
 
 <a href="#" data-post='<?= /* @escapeNotVerified */ $block->getPostDataParams() ?>'

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php

@@ -100,7 +100,7 @@ public function getTree(ResolveInfo $resolveInfo, int $rootCategoryId) : array
         $collection->addFieldToFilter('level', ['lteq' => $level + $depth - self::DEPTH_OFFSET]);
         $collection->setOrder('level');
         $collection->getSelect()->orWhere(
-            $this->metadata->getMetadata(CategoryInterface::class)->getLinkField() . ' = ?',
+            $this->metadata->getMetadata(CategoryInterface::class)->getIdentifierField() . ' = ?',
             $rootCategoryId
         );
         return $this->processTree($collection->getIterator());

app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html

@@ -16,8 +16,8 @@
             <!--/ko-->
             <!-- ko if: (isCustomerLoggedIn && customerHasAddresses) -->
             <div class="choice field">
-                <input type="checkbox" class="checkbox" id="billing-save-in-address-book" data-bind="checked: saveInAddressBook" />
-                <label class="label" for="billing-save-in-address-book">
+                <input type="checkbox" class="checkbox"  data-bind="checked: saveInAddressBook, attr: {id: 'billing-save-in-address-book-' + getCode($parent)}" />
+                <label class="label" data-bind="attr: {for: 'billing-save-in-address-book-' + getCode($parent)}" >
                     <span data-bind="i18n: 'Save in address book'"></span>
                 </label>
             </div>

app/code/Magento/Cookie/view/frontend/web/js/notices.js

@@ -29,7 +29,7 @@ define([
                 });
 
                 if ($.mage.cookies.get(this.options.cookieName)) {
-                    window.location.reload();
+                    this.element.hide();
                 } else {
                     window.location.href = this.options.noCookiesUrl;
                 }

app/code/Magento/Customer/view/frontend/web/js/password-strength-indicator.js

@@ -31,7 +31,7 @@ define([
             this.options.cache.label = $(this.options.passwordStrengthMeterLabelSelector, this.element);
 
             // We need to look outside the module for backward compatibility, since someone can already use the module.
-            // @todo Narrow this selector in 2.3 so it doesn't accidentally finds the the email field from the
+            // @todo Narrow this selector in 2.3 so it doesn't accidentally finds the email field from the
             // newsletter email field or any other "email" field.
             this.options.cache.email = $(this.options.formSelector).find(this.options.emailSelector);
             this._bind();

app/code/Magento/Integration/view/adminhtml/web/js/integration.js

@@ -200,7 +200,7 @@ define([
                     if (IdentityLogin.win.closed ||
                         IdentityLogin.win.location.href == IdentityLogin.successCallbackUrl //eslint-disable-line eqeqeq
                     ) {
-                        //Stop the the polling
+                        //Stop the polling
                         clearInterval(IdentityLogin.checker);
                         $('body').trigger('processStart');
                         //Check for window closed

app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php

@@ -216,7 +216,7 @@ public function getForm()
     }
 
     /**
-     * Return return template name for JS
+     * Return template name for JS
      *
      * @return string
      */