Merge remote-tracking branch 'trigger/MC-42337' into MC-42276

Author: xmav

app/code/Magento/Paypal/Block/PayLater/LayoutProcessor.php

@@ -49,18 +49,18 @@ public function process($jsLayout)
     {
         if (!$this->payLaterConfig->isEnabled(PayLaterConfig::CHECKOUT_PAYMENT_PLACEMENT)) {
             unset($jsLayout['components']['checkout']['children']['steps']['children']['billing-step']
-                ['children']['payment']['children']['payments-list']['children']['before-place-order']['children']
+                ['children']['payment']['children']['payments-list']['children']['paypal-method-extra-content']['children']
                 ['paylater-place-order']);
 
             return $jsLayout;
         }
 
         if (isset($jsLayout['components']['checkout']['children']['steps']['children']['billing-step']
-            ['children']['payment']['children']['payments-list']['children']['before-place-order']['children']
+            ['children']['payment']['children']['payments-list']['children']['paypal-method-extra-content']['children']
             ['paylater-place-order'])
         ) {
             $payLaterPlaceOrder = &$jsLayout['components']['checkout']['children']['steps']['children']['billing-step']
-            ['children']['payment']['children']['payments-list']['children']['before-place-order']['children']
+            ['children']['payment']['children']['payments-list']['children']['paypal-method-extra-content']['children']
             ['paylater-place-order'];
 
             $componentConfig = $payLaterPlaceOrder['config'] ?? [];

app/code/Magento/Paypal/view/frontend/layout/checkout_index_index.xml

@@ -25,12 +25,13 @@
                                                     <item name="children" xsi:type="array">
                                                         <item name="payments-list" xsi:type="array">
                                                             <item name="children" xsi:type="array">
-                                                                <item name="before-place-order" xsi:type="array">
+                                                                <item name="paypal-method-extra-content" xsi:type="array">
+                                                                    <item name="component" xsi:type="string">uiComponent</item>
+                                                                    <item name="displayArea" xsi:type="string">paypal-method-extra-content</item>
                                                                     <item name="children" xsi:type="array">
                                                                         <item name="paylater-place-order" xsi:type="array">
                                                                             <item name="component" xsi:type="string">Magento_Paypal/js/view/paylater</item>
-                                                                            <item name="sortOrder" xsi:type="string">100</item>
-                                                                            <item name="displayArea" xsi:type="string">before-place-order</item>
+                                                                            <item name="displayArea" xsi:type="string">paypal-method-extra-content</item>
                                                                         </item>
                                                                     </item>
                                                                 </item>

app/code/Magento/Paypal/view/frontend/web/template/payment/payflow-express-bml.html

@@ -38,6 +38,9 @@
                 <!-- ko template: getTemplate() --><!-- /ko -->
             <!--/ko-->
         </div>
+        <div class="payment-method-extra-content">
+            <each args="$parent.getRegion('paypal-method-extra-content')" render=""/>
+        </div>
         <div class="actions-toolbar">
             <div class="primary">
                 <button class="action primary checkout"

app/code/Magento/Paypal/view/frontend/web/template/payment/payflow-express.html

@@ -35,6 +35,9 @@
                 <!-- ko template: getTemplate() --><!-- /ko -->
             <!--/ko-->
         </div>
+        <div class="payment-method-extra-content">
+            <each args="$parent.getRegion('paypal-method-extra-content')" render=""/>
+        </div>
         <div class="actions-toolbar">
             <div class="primary">
                 <button class="action primary checkout"

app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html

@@ -31,5 +31,8 @@
             <each args="$parent.getRegion('before-place-order')" render=""/>
         </div>
         <div class="actions-toolbar" attr="id: getButtonId()" afterRender="renderPayPalButtons"/>
+        <div class="payment-method-extra-content">
+            <each args="$parent.getRegion('paypal-method-extra-content')" render=""/>
+        </div>
     </div>
 </div>

app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express.html

@@ -36,6 +36,9 @@
                 <!-- ko template: getTemplate() --><!-- /ko -->
             <!--/ko-->
         </div>
+        <div class="payment-method-extra-content">
+            <each args="$parent.getRegion('paypal-method-extra-content')" render=""/>
+        </div>
         <div class="actions-toolbar">
             <div class="primary">
                 <button class="action primary checkout"

app/design/frontend/Magento/blank/Magento_Paypal/web/css/source/module/_paylater.less

@@ -9,6 +9,7 @@
 
         .pay-later-message {
             margin-bottom: 10px;
+            margin-top: 10px;
         }
     }
 }