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

Author: aplapana

app/code/Magento/Paypal/CustomerData/BuyerCountry.php

@@ -10,7 +10,6 @@
 
 namespace Magento\Paypal\CustomerData;
 
-use Magento\Customer\Api\AddressRepositoryInterface;
 use Magento\Customer\CustomerData\SectionSourceInterface;
 use Magento\Customer\Helper\Session\CurrentCustomer;
 use Magento\Framework\Exception\NoSuchEntityException;
@@ -19,12 +18,9 @@ class BuyerCountry implements SectionSourceInterface
 {
     /**
      * @param CurrentCustomer $currentCustomer
-     * @param AddressRepositoryInterface $addressRepository
      */
-    public function __construct(
-        private readonly CurrentCustomer $currentCustomer,
-        private readonly AddressRepositoryInterface $addressRepository
-    ) {
+    public function __construct(private readonly CurrentCustomer $currentCustomer)
+    {
     }
 
     /**
@@ -40,8 +36,12 @@ public function getSectionData()
                 $customer->getDefaultShipping();
 
             if ($addressId) {
-                $address = $this->addressRepository->getById($addressId);
-                $country = $address->getCountryId();
+                foreach ($customer->getAddresses() as $address) {
+                    if ($address->getId() == $addressId) {
+                        $country = $address->getCountryId();
+                        break;
+                    }
+                }
             }
         } catch (NoSuchEntityException $e) {
             return [

app/code/Magento/Paypal/Test/Unit/CustomerData/BuyerCountryTest.php

@@ -10,7 +10,6 @@
 
 namespace Magento\Paypal\Test\Unit\CustomerData;
 
-use Magento\Customer\Api\AddressRepositoryInterface;
 use Magento\Customer\Api\Data\AddressInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Helper\Session\CurrentCustomer;
@@ -26,11 +25,6 @@ class BuyerCountryTest extends TestCase
      */
     private CurrentCustomer $currentCustomer;
 
-    /**
-     * @var AddressRepositoryInterface|MockObject
-     */
-    private AddressRepositoryInterface $addressRepository;
-
     /**
      * @var BuyerCountry
      */
@@ -42,25 +36,17 @@ class BuyerCountryTest extends TestCase
     protected function setUp(): void
     {
         $this->currentCustomer = $this->createMock(CurrentCustomer::class);
-        $this->addressRepository = $this->createMock(AddressRepositoryInterface::class);
 
-        $this->buyerCountry = new BuyerCountry($this->currentCustomer, $this->addressRepository);
+        $this->buyerCountry = new BuyerCountry($this->currentCustomer);
     }
 
     /**
      * @return void
      */
     public function testGetSectionDataException(): void
     {
-        $customer = $this->createMock(CustomerInterface::class);
-        $customer->expects($this->exactly(2))
-            ->method('getDefaultBilling')
-            ->willReturn(1);
         $this->currentCustomer->expects($this->once())
             ->method('getCustomer')
-            ->willReturn($customer);
-        $this->addressRepository->expects($this->once())
-            ->method('getById')
             ->willThrowException(new NoSuchEntityException());
 
         $this->assertEquals(['code' => null], $this->buyerCountry->getSectionData());
@@ -90,22 +76,28 @@ public function testGetSectionDataNoAddress(): void
      */
     public function testGetSectionDataShippingAddress(): void
     {
+        $addressId = 1;
+        $countryId = 'US';
+        $address = $this->createMock(AddressInterface::class);
+        $address->expects($this->once())
+            ->method('getCountryId')
+            ->willReturn($countryId);
+        $address->expects($this->once())
+            ->method('getId')
+            ->willReturn($addressId);
         $customer = $this->createMock(CustomerInterface::class);
         $customer->expects($this->once())
             ->method('getDefaultBilling')
             ->willReturn(null);
         $customer->expects($this->once())
             ->method('getDefaultShipping')
-            ->willReturn(1);
+            ->willReturn($addressId);
+        $customer->expects($this->once())->method('getAddresses')
+            ->willReturn([$address]);
         $this->currentCustomer->expects($this->once())
             ->method('getCustomer')
             ->willReturn($customer);
-        $address = $this->createMock(AddressInterface::class);
-        $address->expects($this->once())
-            ->method('getCountryId')
-            ->willReturn('US');
-        $this->addressRepository->expects($this->once())->method('getById')->willReturn($address);
 
-        $this->assertEquals(['code' => 'US'], $this->buyerCountry->getSectionData());
+        $this->assertEquals(['code' => $countryId], $this->buyerCountry->getSectionData());
     }
 }