ACP2E-3028: Paylater message not showing in PDP for Canadian paypal merchant account

Author: aplapana

app/code/Magento/Paypal/Block/Adminhtml/System/Config/PayLaterLink.php

@@ -29,7 +29,7 @@ class PayLaterLink extends Field
     /**
      * @var array.
      */
-    private const ARRAY_PAYLATER_SUPPORTED_COUNTRIES = ['US','GB','DE','FR','AU','IT','ES'];
+    public const ARRAY_PAYLATER_SUPPORTED_COUNTRIES = ['US','GB','DE','FR','AU','IT','ES'];
 
     /**
      * @var ScopeConfigInterface

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

@@ -9,10 +9,13 @@
 namespace Magento\Paypal\Block\PayLater;
 
 use Magento\Framework\View\Element\Template;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Paypal\Block\Adminhtml\System\Config\PayLaterLink;
 use Magento\Paypal\Model\PayLaterConfig;
 use Magento\Paypal\Model\SdkUrl;
 use Magento\Paypal\Model\Config as PaypalConfig;
 use Magento\Framework\App\ObjectManager;
+use Magento\Customer\Model\Session as CustomerSession;
 
 /**
  * PayPal PayLater component block
@@ -46,18 +49,30 @@ class Banner extends Template
     private $paypalConfig;
 
     /**
-     * @param Template\Context $context
+     * @var string|null
+     */
+    private ?string $buyerCountry = null;
+
+    /**
+     * @var CustomerSession
+     */
+    private CustomerSession $session;
+
+    /**
+     * @param Context $context
      * @param PayLaterConfig $payLaterConfig
      * @param SdkUrl $sdkUrl
      * @param array $data
-     * @param PaypalConfig $paypalConfig
+     * @param PaypalConfig|null $paypalConfig
+     * @param CustomerSession|null $session
      */
     public function __construct(
         Template\Context $context,
         PayLaterConfig $payLaterConfig,
         SdkUrl $sdkUrl,
         array $data = [],
-        PaypalConfig $paypalConfig = null
+        ?PaypalConfig $paypalConfig = null,
+        ?CustomerSession $session = null
     ) {
         parent::__construct($context, $data);
         $this->payLaterConfig = $payLaterConfig;
@@ -66,6 +81,7 @@ public function __construct(
         $this->position = $data['position'] ??  '';
         $this->paypalConfig = $paypalConfig ?: ObjectManager::getInstance()
             ->get(PaypalConfig::class);
+        $this->session = $session ?: ObjectManager::getInstance()->get(CustomerSession::class);
     }
 
     /**
@@ -105,7 +121,7 @@ public function getJsLayout()
         $componentAttributes = $this->jsLayout['components']['payLater']['config']['attributes'] ?? [];
         $config['attributes'] = array_replace($this->getStyleAttributesConfig(), $componentAttributes);
         $config['attributes']['data-pp-placement'] = $this->placement;
-        $config['attributes']['data-pp-buyercountry'] = 'US'; // this should be dynamic. Possible values listed here: https://developer.paypal.com/limited-release/sdk-pay-later-messaging-cross-border/#link-renderthemessageswiththebuyercountryparameter
+        $config['attributes']['data-pp-buyercountry'] = $this->getBuyerCountry();
 
         $this->jsLayout = [
             'components' => [
@@ -148,7 +164,44 @@ private function isEnabled(): bool
     {
         $enabled = $this->payLaterConfig->isEnabled($this->placement);
         return $enabled &&
+            $this->isBuyerCountryAvailable() &&
             $this->payLaterConfig->getSectionConfig($this->placement, PayLaterConfig::CONFIG_KEY_POSITION) ===
                 $this->position;
     }
+
+    /**
+     * The pay later message should be displayed only if the buyer country is available
+     *
+     * @return bool
+     */
+    private function isBuyerCountryAvailable(): bool
+    {
+        return (bool)$this->getBuyerCountry();
+    }
+
+    /**
+     * Buyer country should be extracted from logged-in user billing or shipping address
+     *
+     * @return string
+     */
+    private function getBuyerCountry(): string
+    {
+        if ($this->buyerCountry === null) {
+            $country = null;
+            if ($this->session->isLoggedIn()) {
+                $address = $this->session->getCustomer()->getPrimaryBillingAddress() ?
+                    $this->session->getCustomer()->getPrimaryBillingAddress() :
+                    $this->session->getCustomer()->getDefaultShippingAddress();
+                $country = $address->getCountryId();
+            }
+
+            if (in_array($country, PayLaterLink::ARRAY_PAYLATER_SUPPORTED_COUNTRIES)) {
+                $this->buyerCountry = $country;
+            } else {
+                $this->buyerCountry = '';
+            }
+        }
+
+        return $this->buyerCountry;
+    }
 }

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

@@ -15,7 +15,7 @@
                 </arguments>
             </block>
             <block class="Magento\Paypal\Block\PayLater\Banner" name="top.container.paylater"
-                   template="Magento_Paypal::paylater/banner.phtml">
+                   template="Magento_Paypal::paylater/banner.phtml" cacheable="false">
                 <arguments>
                     <argument name="placement" xsi:type="string">product</argument>
                     <argument name="position" xsi:type="string">header</argument>
@@ -44,7 +44,7 @@
                 </arguments>
             </block>
             <block class="Magento\Paypal\Block\PayLater\Banner" name="product.info.addtocart.paylater"
-                   template="Magento_Paypal::paylater/banner.phtml">
+                   template="Magento_Paypal::paylater/banner.phtml" cacheable="false">
                 <arguments>
                     <argument name="placement" xsi:type="string">product</argument>
                     <argument name="position" xsi:type="string">near_pp_button</argument>
@@ -67,7 +67,7 @@
         </referenceContainer>
         <referenceBlock name="product.info.addtocart.additional">
             <block class="Magento\Paypal\Block\PayLater\Banner" name="product.info.addtocart.additional.paylater"
-                   template="Magento_Paypal::paylater/banner.phtml">
+                   template="Magento_Paypal::paylater/banner.phtml" cacheable="false">
                 <arguments>
                     <argument name="placement" xsi:type="string">product</argument>
                     <argument name="position" xsi:type="string">near_pp_button</argument>

app/code/Magento/Paypal/view/frontend/web/js/view/paylater.js

@@ -51,7 +51,7 @@ define([
                 layout([this.amountComponentConfig]);
             }
 
-            if (this.sdkUrl !== '') {
+            if (this.sdkUrl !== '') { // we should probably make a check here if we should load it or not
                 this.loadPayPalSdk(this.sdkUrl, this.dataAttributes)
                     .then(this._setPayPalObject.bind(this));
             }