MC-33110: Paypal Express Checkout - payment loading infinitely in checkout

Author: rostyslav-hymon

app/code/Magento/Paypal/Model/SmartButtonConfig.php

@@ -13,7 +13,7 @@
 use Magento\Store\Model\ScopeInterface;
 
 /**
- * Smart button config
+ * Smart button configuration.
  */
 class SmartButtonConfig
 {
@@ -96,7 +96,14 @@ public function getConfig(string $page): array
     private function getDisallowedFunding(): array
     {
         $disallowedFunding = $this->config->getValue('disable_funding_options');
-        return $disallowedFunding ? explode(',', $disallowedFunding) : [];
+        $result = $disallowedFunding ? explode(',', $disallowedFunding) : [];
+
+        // PayPal Guest Checkout Credit Card Icons only available when Guest Checkout option is enabled
+        if ($this->isPaypalGuestCheckoutAllowed() === false && !in_array('CARD', $result)) {
+            array_push($result, 'CARD');
+        }
+
+        return $result;
     }
 
     /**
@@ -168,4 +175,14 @@ private function updateStyles(array $styles, string $page): array
 
         return $styles;
     }
+
+    /**
+     * Returns if is allowed PayPal Guest Checkout.
+     *
+     * @return bool
+     */
+    private function isPaypalGuestCheckoutAllowed(): bool
+    {
+        return $this->config->getValue('solution_type') === Config::EC_SOLUTION_TYPE_SOLE;
+    }
 }

app/code/Magento/Paypal/Test/Unit/Model/SmartButtonConfigTest.php

@@ -13,9 +13,6 @@
 use Magento\Framework\Locale\ResolverInterface;
 use Magento\Paypal\Model\ConfigFactory;
 
-/**
- * Class SmartButtonConfigTest
- */
 class SmartButtonConfigTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -65,6 +62,7 @@ protected function setUp()
      *
      * @param string $page
      * @param string $locale
+     * @param bool $isCustomize
      * @param string $disallowedFundings
      * @param string $layout
      * @param string $size
@@ -73,6 +71,7 @@ protected function setUp()
      * @param string $color
      * @param string $installmentPeriodLabel
      * @param string $installmentPeriodLocale
+     * @param string $isPaypalGuestCheckoutEnabled
      * @param array $expected
      * @dataProvider getConfigDataProvider
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -89,13 +88,19 @@ public function testGetConfig(
         string $color,
         string $installmentPeriodLabel,
         string $installmentPeriodLocale,
+        string $isPaypalGuestCheckoutEnabled,
         array $expected = []
     ) {
-        $this->localeResolverMock->expects($this->any())->method('getLocale')->willReturn($locale);
+        $this->localeResolverMock->method('getLocale')->willReturn($locale);
         $this->configMock->method('getValue')->will(
             $this->returnValueMap(
                 [
                     ['merchant_id', null, 'merchant'],
+                    [
+                        'solution_type',
+                        null,
+                        $isPaypalGuestCheckoutEnabled ? Config::EC_SOLUTION_TYPE_SOLE : Config::EC_SOLUTION_TYPE_MARK
+                    ],
                     ['sandbox_flag', null, true],
                     ['disable_funding_options', null, $disallowedFundings],
                     ["{$page}_page_button_customize", null, $isCustomize],

app/code/Magento/Paypal/Test/Unit/Model/_files/expected_config.php

@@ -18,6 +18,7 @@
         'blue',
         'my_label',
         'mx',
+        true,
         [
             'merchantId' => 'merchant',
             'environment' => 'sandbox',
@@ -48,6 +49,7 @@
         'blue',
         'my_label',
         'br',
+        true,
         [
             'merchantId' => 'merchant',
             'environment' => 'sandbox',
@@ -78,6 +80,7 @@
         'blue',
         'my_label',
         'br',
+        true,
         [
             'merchantId' => 'merchant',
             'environment' => 'sandbox',
@@ -95,62 +98,65 @@
             'isGuestCheckoutAllowed' => true
         ]
     ],
-    'mini_cart' => [
+    'product' => [
         'cart',
         'en',
         false,
-        null,
+        'CREDIT',
         'horizontal',
         'small',
         'pillow',
         'installment',
         'blue',
         'my_label',
         'br',
+        true,
         [
             'merchantId' => 'merchant',
             'environment' => 'sandbox',
             'locale' => 'en',
-            'allowedFunding' => ['CREDIT', 'ELV'],
-            'disallowedFunding' => [],
+            'allowedFunding' => ['ELV'],
+            'disallowedFunding' => ['CREDIT'],
             'styles' => [
                 'layout' => 'vertical',
                 'size' => 'responsive',
                 'color' => 'gold',
                 'shape' => 'rect',
-                'label' => 'paypal'
+                'label' => 'paypal',
             ],
             'isVisibleOnProductPage' => false,
             'isGuestCheckoutAllowed' => true
         ]
     ],
-    'product' => [
+    'checkout_with_paypal_guest_checkout_disabled' => [
         'cart',
-        'en',
-        false,
-        'CREDIT',
+        'en_BR',
+        true,
+        null,
         'horizontal',
         'small',
         'pillow',
         'installment',
         'blue',
         'my_label',
         'br',
+        false,
         [
             'merchantId' => 'merchant',
             'environment' => 'sandbox',
-            'locale' => 'en',
-            'allowedFunding' => ['ELV'],
-            'disallowedFunding' => ['CREDIT'],
+            'locale' => 'en_BR',
+            'allowedFunding' => ['CREDIT', 'ELV'],
+            'disallowedFunding' => ['CARD'],
             'styles' => [
-                'layout' => 'vertical',
-                'size' => 'responsive',
-                'color' => 'gold',
-                'shape' => 'rect',
-                'label' => 'paypal',
+                'layout' => 'horizontal',
+                'size' => 'small',
+                'color' => 'blue',
+                'shape' => 'pillow',
+                'label' => 'installment',
+                'installmentperiod' => 0
             ],
             'isVisibleOnProductPage' => false,
             'isGuestCheckoutAllowed' => true
         ]
-    ]
+    ],
 ];