🔃 [EngCom] Public Pull Requests - 2.3-develop

Accepted Public Pull Requests:
 - #20042: #12549: Payment method option is not showing under shopping cart rules condition tab. (by @p-bystritsky)
 - #19803: Fixed 19800 Contact us : design improvement (by @suryakant-krish)
 - #19643: Fixed issue 19642- Catalog product action multi select search label icon alignment issue  (by @abrarpathan19)
 - #19644: correct devdocs url from http to https (by @ravi-chandra3197)
 - #19665: Configure missing group for core payment methods  (by @wojtekn)
 - #18471: [2.3] Alternative fix for Multi Store Emails issue, Fix Async Emails issues, Fix Multiple Email issues (by @gwharton)
 - #18407: added config for newsletter in frontend (by @torhoehn)


Fixed GitHub Issues:
 - #12549:  Payment method option is not showing under shopping cart rules condition tab (reported by @AbdurBhadarka) has been fixed in #20042 by @p-bystritsky in 2.3-develop branch
   Related commits:
     1. 76ca463

 - #19800: Contact us : design improvement (reported by @suryakant-krish) has been fixed in #19803 by @suryakant-krish in 2.3-develop branch
   Related commits:
     1. 10e7927
     2. b618757
     3. c8fa36f
     4. abfa040
     5. 2e08f60
     6. 6e47e58
     7. 9bf7ab7

 - #19642: Catalog product action multi select search label icon alignment issue  (reported by @abrarpathan19) has been fixed in #19643 by @abrarpathan19 in 2.3-develop branch
   Related commits:
     1. f72c013
     2. f49c569

 - #19664: Payment methods from core source model are not grouped properly (reported by @wojtekn) has been fixed in #19665 by @wojtekn in 2.3-develop branch
   Related commits:
     1. 614a7e4
     2. 9566898

 - #7739: "From Header set twice" when sending an email (reported by @RishabhRkRai) has been fixed in #18471 by @gwharton in 2.3-develop branch
   Related commits:
     1. ad50297
     2. e16ff74
     3. 621d2cf
     4. b6f9e48
     5. 0dc8578
     6. 122019c
     7. 193c6c2
     8. bd0aa57
     9. 523b046
     10. 424929f
     11. c32ca7a
     12. e39ce7a
     13. 99621b3
     14. f171c9d

 - #11740: Sending emails from Admin in Multi-Store Environment defaults to Primary Store (reported by @lee586) has been fixed in #18471 by @gwharton in 2.3-develop branch
   Related commits:
     1. ad50297
     2. e16ff74
     3. 621d2cf
     4. b6f9e48
     5. 0dc8578
     6. 122019c
     7. 193c6c2
     8. bd0aa57
     9. 523b046
     10. 424929f
     11. c32ca7a
     12. e39ce7a
     13. 99621b3
     14. f171c9d

 - #14236: Sending multiple emails using the TransportBuilder class causes an Zend_Mail exception (reported by @david-kominek) has been fixed in #18471 by @gwharton in 2.3-develop branch
   Related commits:
     1. ad50297
     2. e16ff74
     3. 621d2cf
     4. b6f9e48
     5. 0dc8578
     6. 122019c
     7. 193c6c2
     8. bd0aa57
     9. 523b046
     10. 424929f
     11. c32ca7a
     12. e39ce7a
     13. 99621b3
     14. f171c9d

 - #14945: Store Email Addresses are not used anymore (reported by @chequille) has been fixed in #18471 by @gwharton in 2.3-develop branch
   Related commits:
     1. ad50297
     2. e16ff74
     3. 621d2cf
     4. b6f9e48
     5. 0dc8578
     6. 122019c
     7. 193c6c2
     8. bd0aa57
     9. 523b046
     10. 424929f
     11. c32ca7a
     12. e39ce7a
     13. 99621b3
     14. f171c9d

 - #14952: Confirmation emails have no FROM or FROM email address 2.2.4 (reported by @tstamplis) has been fixed in #18471 by @gwharton in 2.3-develop branch
   Related commits:
     1. ad50297
     2. e16ff74
     3. 621d2cf
     4. b6f9e48
     5. 0dc8578
     6. 122019c
     7. 193c6c2
     8. bd0aa57
     9. 523b046
     10. 424929f
     11. c32ca7a
     12. e39ce7a
     13. 99621b3
     14. f171c9d

 - #16165: Sales Emails Async Sending issue (reported by @mihaifaget) has been fixed in #18471 by @gwharton in 2.3-develop branch
   Related commits:
     1. ad50297
     2. e16ff74
     3. 621d2cf
     4. b6f9e48
     5. 0dc8578
     6. 122019c
     7. 193c6c2
     8. bd0aa57
     9. 523b046
     10. 424929f
     11. c32ca7a
     12. e39ce7a
     13. 99621b3
     14. f171c9d

 - #16203: New order notification is not sent to the admin (reported by @bnymn) has been fixed in #18471 by @gwharton in 2.3-develop branch
   Related commits:
     1. ad50297
     2. e16ff74
     3. 621d2cf
     4. b6f9e48
     5. 0dc8578
     6. 122019c
     7. 193c6c2
     8. bd0aa57
     9. 523b046
     10. 424929f
     11. c32ca7a
     12. e39ce7a
     13. 99621b3
     14. f171c9d

 - #16355: Magento 2.2.4 not sending from sales sender (reported by @versdivers) has been fixed in #18471 by @gwharton in 2.3-develop branch
   Related commits:
     1. ad50297
     2. e16ff74
     3. 621d2cf
     4. b6f9e48
     5. 0dc8578
     6. 122019c
     7. 193c6c2
     8. bd0aa57
     9. 523b046
     10. 424929f
     11. c32ca7a
     12. e39ce7a
     13. 99621b3
     14. f171c9d

 - #16509: Magento 2.2.4 Multishipping Order Confirmation Emails sent only for the first order (reported by @arjuninfo) has been fixed in #18471 by @gwharton in 2.3-develop branch
   Related commits:
     1. ad50297
     2. e16ff74
     3. 621d2cf
     4. b6f9e48
     5. 0dc8578
     6. 122019c
     7. 193c6c2
     8. bd0aa57
     9. 523b046
     10. 424929f
     11. c32ca7a
     12. e39ce7a
     13. 99621b3
     14. f171c9d

 - #17781: Magento 2.2.5 Order Email Confirmation is not working (reported by @nilesh111091) has been fixed in #18471 by @gwharton in 2.3-develop branch
   Related commits:
     1. ad50297
     2. e16ff74
     3. 621d2cf
     4. b6f9e48
     5. 0dc8578
     6. 122019c
     7. 193c6c2
     8. bd0aa57
     9. 523b046
     10. 424929f
     11. c32ca7a
     12. e39ce7a
     13. 99621b3
     14. f171c9d

 - #18470: Store emails have correct from address but do not have a from name (reported by @gwharton) has been fixed in #18471 by @gwharton in 2.3-develop branch
   Related commits:
     1. ad50297
     2. e16ff74
     3. 621d2cf
     4. b6f9e48
     5. 0dc8578
     6. 122019c
     7. 193c6c2
     8. bd0aa57
     9. 523b046
     10. 424929f
     11. c32ca7a
     12. e39ce7a
     13. 99621b3
     14. f171c9d

Author: magento-engcom-team

.github/CONTRIBUTING.md

@@ -16,7 +16,7 @@ The Magento 2 development team will review all issues and contributions submitte
 4. PRs which include bug fixes must be accompanied with a step-by-step description of how to reproduce the bug.
 3. PRs which include new logic or new features must be submitted along with:
 * Unit/integration test coverage
-* Proposed [documentation](http://devdocs.magento.com) updates. Documentation contributions can be submitted via the [devdocs GitHub](https://github.com/magento/devdocs).
+* Proposed [documentation](https://devdocs.magento.com) updates. Documentation contributions can be submitted via the [devdocs GitHub](https://github.com/magento/devdocs).
 4. For larger features or changes, please [open an issue](https://github.com/magento/magento2/issues) to discuss the proposed changes prior to development. This may prevent duplicate or unnecessary effort and allow other contributors to provide input.
 5. All automated tests must pass (all builds on [Travis CI](https://travis-ci.org/magento/magento2) must be green).
 
@@ -27,7 +27,7 @@ If you are a new GitHub user, we recommend that you create your own [free github
 1. Search current [listed issues](https://github.com/magento/magento2/issues) (open or closed) for similar proposals of intended contribution before starting work on a new contribution.
 2. Review the [Contributor License Agreement](https://magento.com/legaldocuments/mca) if this is your first time contributing.
 3. Create and test your work.
-4. Fork the Magento 2 repository according to the [Fork A Repository instructions](http://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow the [Create A Pull Request instructions](http://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#pull_request).
+4. Fork the Magento 2 repository according to the [Fork A Repository instructions](https://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow the [Create A Pull Request instructions](https://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#pull_request).
 5. Once your contribution is received the Magento 2 development team will review the contribution and collaborate with you as needed.
 
 ## Code of Conduct

CHANGELOG.md

@@ -4,7 +4,7 @@ To get detailed information about changes in Magento 2.3.0, see the [Release Not
 
 2.1.0
 =============
-To get detailed information about changes in Magento 2.1.0, please visit [Magento Community Edition (CE) Release Notes](http://devdocs.magento.com/guides/v2.1/release-notes/ReleaseNotes2.1.0CE.html "Magento Community Edition (CE) Release Notes")
+To get detailed information about changes in Magento 2.1.0, please visit [Magento Community Edition (CE) Release Notes](https://devdocs.magento.com/guides/v2.1/release-notes/ReleaseNotes2.1.0CE.html "Magento Community Edition (CE) Release Notes")
 
 2.0.0
 =============
@@ -1025,7 +1025,7 @@ Tests:
     * Improved backend menu keyboard accessibility
     * Accessibility improvements: WAI-ARIA in a product item on a category page and related products
     * Checkout flow code can work with a separate DB storage
-    * <a href="http://devdocs.magento.com/guides/v1.0/release-notes/changes.html#change-devrc-unit">Unit tests moved to module directories</a>
+    * <a href="https://devdocs.magento.com/guides/v1.0/release-notes/changes.html#change-devrc-unit">Unit tests moved to module directories</a>
     * Addressed naming inconsistencies in REST routes
     * Added Advanced Developer workflow for frontend developers
 * Setup

app/code/Magento/Analytics/README.md

@@ -1,6 +1,6 @@
 # Magento_Analytics Module
 
-The Magento_Analytics module integrates your Magento instance with the [Magento Business Intelligence (MBI)](https://magento.com/products/business-intelligence) to use [Advanced Reporting](http://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html) functionality.
+The Magento_Analytics module integrates your Magento instance with the [Magento Business Intelligence (MBI)](https://magento.com/products/business-intelligence) to use [Advanced Reporting](https://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html) functionality.
 
 The module implements the following functionality:
 
@@ -16,8 +16,8 @@ The module implements the following functionality:
 
 ## Structure
 
-Beyond the [usual module file structure](http://devdocs.magento.com/guides/v2.2/architecture/archi_perspectives/components/modules/mod_intro.html) the module contains a directory `ReportXml`.
-[Report XML](http://devdocs.magento.com/guides/v2.2/advanced-reporting/report-xml.html) is a markup language used to build reports for Advanced Reporting.
+Beyond the [usual module file structure](https://devdocs.magento.com/guides/v2.2/architecture/archi_perspectives/components/modules/mod_intro.html) the module contains a directory `ReportXml`.
+[Report XML](https://devdocs.magento.com/guides/v2.2/advanced-reporting/report-xml.html) is a markup language used to build reports for Advanced Reporting.
 The language declares SQL queries using XML declaration.
 
 ## Subscription Process

app/code/Magento/Authorizenet/etc/config.xml

@@ -33,6 +33,7 @@
                 <cgi_url_td_test_mode>https://apitest.authorize.net/xml/v1/request.api</cgi_url_td_test_mode>
                 <cgi_url_td>https://api2.authorize.net/xml/v1/request.api</cgi_url_td>
                 <paymentInfoKeys>x_card_type,x_account_number,x_avs_code,x_auth_code,x_response_reason_text,x_cvv2_resp_code</paymentInfoKeys>
+                <group>authorizenet</group>
             </authorizenet_directpost>
         </payment>
     </default>

app/code/Magento/Authorizenet/etc/payment.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<payment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Payment:etc/payment.xsd">
+    <groups>
+        <group id="authorizenet">
+            <label>Authorize.net</label>
+        </group>
+    </groups>
+</payment>

app/code/Magento/Braintree/etc/config.xml

@@ -42,6 +42,7 @@
                 <paymentInfoKeys>cc_type,cc_number,avsPostalCodeResponseCode,avsStreetAddressResponseCode,cvvResponseCode,processorAuthorizationCode,processorResponseCode,processorResponseText,liabilityShifted,liabilityShiftPossible,riskDataId,riskDataDecision</paymentInfoKeys>
                 <avs_ems_adapter>Magento\Braintree\Model\AvsEmsCodeMapper</avs_ems_adapter>
                 <cvv_ems_adapter>Magento\Braintree\Model\CvvEmsCodeMapper</cvv_ems_adapter>
+                <group>braintree</group>
             </braintree>
             <braintree_paypal>
                 <model>BraintreePayPalFacade</model>
@@ -67,6 +68,7 @@
                 <privateInfoKeys>processorResponseCode,processorResponseText,paymentId</privateInfoKeys>
                 <paymentInfoKeys>processorResponseCode,processorResponseText,paymentId,payerEmail</paymentInfoKeys>
                 <supported_locales>en_US,en_GB,en_AU,da_DK,fr_FR,fr_CA,de_DE,zh_HK,it_IT,nl_NL,no_NO,pl_PL,es_ES,sv_SE,tr_TR,pt_BR,ja_JP,id_ID,ko_KR,pt_PT,ru_RU,th_TH,zh_CN,zh_TW</supported_locales>
+                <group>braintree</group>
             </braintree_paypal>
             <braintree_cc_vault>
                 <model>BraintreeCreditCardVaultFacade</model>
@@ -76,6 +78,7 @@
                     <tokenFormat>Magento\Braintree\Model\InstantPurchase\CreditCard\TokenFormatter</tokenFormat>
                     <additionalInformation>Magento\Braintree\Model\InstantPurchase\PaymentAdditionalInformationProvider</additionalInformation>
                 </instant_purchase>
+                <group>braintree</group>
             </braintree_cc_vault>
             <braintree_paypal_vault>
                 <model>BraintreePayPalVaultFacade</model>
@@ -85,6 +88,7 @@
                     <tokenFormat>Magento\Braintree\Model\InstantPurchase\PayPal\TokenFormatter</tokenFormat>
                     <additionalInformation>Magento\Braintree\Model\InstantPurchase\PaymentAdditionalInformationProvider</additionalInformation>
                 </instant_purchase>
+                <group>braintree</group>
             </braintree_paypal_vault>
         </payment>
     </default>

app/code/Magento/Braintree/etc/payment.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<payment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Payment:etc/payment.xsd">
+    <groups>
+        <group id="braintree">
+            <label>Braintree</label>
+        </group>
+    </groups>
+</payment>

app/code/Magento/CatalogAnalytics/README.md

@@ -1,3 +1,3 @@
 # Magento_CatalogAnalytics module
 
-The Magento_CatalogAnalytics module configures data definitions for a data collection related to the Catalog module entities to be used in [Advanced Reporting](http://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
+The Magento_CatalogAnalytics module configures data definitions for a data collection related to the Catalog module entities to be used in [Advanced Reporting](https://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).

app/code/Magento/Contact/view/frontend/web/css/source/_module.less

@@ -0,0 +1,42 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+*/
+
+& when (@media-common = true) {
+    .contact-index-index {
+        .column:not(.sidebar-main) {
+            .form.contact {
+                float: none;
+                width: 50%;
+            }
+        }
+
+        .column:not(.sidebar-additional) {
+            .form.contact {
+                float: none;
+                width: 50%;
+            }
+        }
+    }
+}
+
+//  Mobile
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
+    .contact-index-index {
+        .column:not(.sidebar-main) {
+            .form.contact {
+                float: none;
+                width: 100%;
+            }
+        }
+
+        .column:not(.sidebar-additional) {
+            .form.contact {
+                float: none;
+                width: 100%;
+            }
+        }
+    }
+}
+

app/code/Magento/Customer/Api/CustomerRepositoryInterface.php

@@ -51,7 +51,7 @@ public function getById($customerId);
      * Retrieve customers which match a specified criteria.
      *
      * This call returns an array of objects, but detailed information about each object’s attributes might not be
-     * included. See http://devdocs.magento.com/codelinks/attributes.html#CustomerRepositoryInterface to determine
+     * included. See https://devdocs.magento.com/codelinks/attributes.html#CustomerRepositoryInterface to determine
      * which call to use to get detailed information about all attributes for an object.
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria