Merge remote-tracking branch 'trigger/MC-42208' into MC-41701

xmav · xmav · commit 4104facf4cb2 · 2021-05-10T14:09:39.000-05:00
diff --git a/app/code/Magento/Paypal/Model/PayLaterConfig.php b/app/code/Magento/Paypal/Model/PayLaterConfig.php
@@ -41,14 +41,14 @@ class PayLaterConfig
 
     /**
      * @param ScopeConfigInterface $scopeConfig
-     * @param Config $config
+     * @param ConfigFactory $configFactory
      */
     public function __construct(
         ScopeConfigInterface $scopeConfig,
-        Config $config
+        ConfigFactory $configFactory
     ) {
         $this->scopeConfig = $scopeConfig;
-        $this->config = $config;
+        $this->config = $configFactory->create();
     }
 
     /**
@@ -75,8 +75,13 @@ public function isEnabled(string $placement): bool
      */
     private function isPPCreditEnabled()
     {
-        return $this->config->isMethodAvailable(Config::METHOD_WPP_BML)
-            || $this->config->isMethodAvailable(Config::METHOD_WPS_BML)
+        $isEnabled = false;
+        if ($this->config->setMethod(Config::METHOD_EXPRESS)->getValue('in_context')) {
+            $disabledFunding = $this->config->getValue('disable_funding_options');
+            $isEnabled = $disabledFunding ? strpos($disabledFunding, 'CREDIT') === false : true;
+        }
+
+        return $isEnabled || $this->config->isMethodAvailable(Config::METHOD_WPP_BML)
             || $this->config->isMethodAvailable(Config::METHOD_WPP_PE_BML);
     }
 
diff --git a/app/code/Magento/Paypal/view/frontend/layout/catalog_product_view_type_bundle.xml b/app/code/Magento/Paypal/view/frontend/layout/catalog_product_view_type_bundle.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceBlock name="product.info.addtocart.bundle">
+            <block class="Magento\Paypal\Block\PayLater\Banner" name="product.info.addtocart.additional.paylater"
+                   template="Magento_Paypal::paylater/banner.phtml">
+                <arguments>
+                    <argument name="placement" xsi:type="string">product</argument>
+                    <argument name="position" xsi:type="string">near_pp_button</argument>
+                    <argument name="jsLayout" xsi:type="array">
+                        <item name="components" xsi:type="array">
+                            <item name="payLater" xsi:type="array">
+                                <item name="config" xsi:type="array">
+                                    <item name="refreshSelector" xsi:type="string">#bundle-slide</item>
+                                </item>
+                            </item>
+                        </item>
+                    </argument>
+                </arguments>
+            </block>
+        </referenceBlock>
+    </body>
+</page>
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/paylater.js b/app/code/Magento/Paypal/view/frontend/web/js/view/paylater.js
@@ -25,36 +25,43 @@ define([
             sdkUrl: '',
             priceBoxSelector: '.price-box',
             qtyFieldSelector: '#product_addtocart_form [name="qty"]',
+            refreshSelector: '',
             displayAmount: true,
             attributes: {}
         },
         amount: ko.observable(),
         qty: 1,
         price: 0,
+        paypal: null,
 
         /**
          * Initialize
          *
          * @returns {*}
          */
         initialize: function () {
-            var priceBox, qty;
+            var priceBox;
 
             this._super();
-            this.loadPayPalSdk(this.sdkUrl);
+            this.loadPayPalSdk()
+                .then(this._setPayPalObject.bind(this));
 
             if (this.displayAmount) {
                 priceBox = $(this.priceBoxSelector);
+                priceBox.on('priceUpdated', this._onPriceChange.bind(this));
 
                 if (priceBox.priceBox('option') &&
-                    priceBox.priceBox('option').prices
+                    priceBox.priceBox('option').prices &&
+                    priceBox.priceBox('option').prices.finalPrice
                 ) {
                     this.price = priceBox.priceBox('option').prices.finalPrice.amount;
-                    priceBox.on('priceUpdated', this._onPriceChange.bind(this));
                 }
 
-                qty = $(this.qtyFieldSelector);
-                qty.on('change', this._onQtyChange.bind(this));
+                $(this.qtyFieldSelector).on('change', this._onQtyChange.bind(this));
+
+                if (this.refreshSelector) {
+                    $(this.refreshSelector).on('click', this._refreshMessages.bind(this));
+                }
 
                 this._updateAmount();
             }
@@ -113,11 +120,30 @@ define([
 
         /**
          * Load PP SDK with preconfigured options
+         */
+        loadPayPalSdk: function () {
+            return paypalSdk(this.sdkUrl);
+        },
+
+        /**
+         * Set reference to paypal Sdk object
+         *
+         * @param {Object} paypal
+         * @private
+         */
+        _setPayPalObject: function (paypal) {
+            this.paypal = paypal;
+        },
+
+        /**
+         * Render messages
          *
-         * @param {String} sdkUrl
+         * @private
          */
-        loadPayPalSdk: function (sdkUrl) {
-            paypalSdk(sdkUrl);
+        _refreshMessages: function () {
+            if (this.paypal) {
+                this.paypal.Messages.render();
+            }
         }
     });
 });
