MC-33524: Couldn't set up Installment button for locale Mexico and Brazil

Author: irenelagno

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

@@ -1515,6 +1515,7 @@ protected function _mapExpressFieldset($fieldName)
             case 'client_id':
             case 'sandbox_client_id':
             case 'supported_locales':
+            case 'smart_buttons_supported_locales':
                 return "payment/{$this->_methodCode}/{$fieldName}";
             default:
                 return $this->_mapMethodFieldset($fieldName);

app/code/Magento/Paypal/Model/Express/LocaleResolver.php

@@ -89,7 +89,9 @@ public function setLocale($locale = null)
     public function getLocale(): string
     {
         $locale = $this->localeMap[$this->resolver->getLocale()] ?? $this->resolver->getLocale();
-        $allowedLocales = $this->config->getValue('supported_locales');
+        $allowedLocales =(bool)(int) $this->config->getValue('in_context')
+            ? $this->config->getValue('smart_buttons_supported_locales')
+            : $this->config->getValue('supported_locales');
 
         return strpos($allowedLocales, $locale) !== false ? $locale : 'en_US';
     }

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

@@ -222,7 +222,7 @@ private function updateStyles(array $styles, string $page): array
         // Installment label is only available for specific locales
         if ($styles['label'] === 'installment') {
             if (array_key_exists($locale, $installmentPeriodLocale)) {
-                $styles['installmentperiod'] = (int)$this->config->getValue(
+                $styles['period'] = (int)$this->config->getValue(
                     $page .'_page_button_' . $installmentPeriodLocale[$locale] . '_installment_period'
                 );
             } else {

app/code/Magento/Paypal/Test/Unit/Model/Express/LocaleResolverTest.php

@@ -13,7 +13,7 @@
 use Magento\Paypal\Model\Express\LocaleResolver as ExpressLocaleResolver;
 
 /**
- * Class LocaleResolverTest
+ * Test for PayPal express checkout resolver
  */
 class LocaleResolverTest extends \PHPUnit\Framework\TestCase
 {
@@ -27,18 +27,20 @@ class LocaleResolverTest extends \PHPUnit\Framework\TestCase
      */
     private $model;
 
+    /**
+     * @var Config
+     */
+    private $config;
+
     protected function setUp()
     {
         $this->resolver = $this->createMock(ResolverInterface::class);
         /** @var Config $config */
-        $config = $this->createMock(Config::class);
-        $config->method('getValue')
-            ->with('supported_locales')
-            ->willReturn('zh_CN,zh_HK,zh_TW,fr_FR');
+        $this->config = $this->createMock(Config::class);
 
         /** @var ConfigFactory $configFactory */
         $configFactory = $this->createPartialMock(ConfigFactory::class, ['create']);
-        $configFactory->method('create')->willReturn($config);
+        $configFactory->method('create')->willReturn($this->config);
 
         $this->model = new ExpressLocaleResolver($this->resolver, $configFactory);
     }
@@ -54,7 +56,14 @@ public function testGetLocale(string $locale, string $expectedLocale)
     {
         $this->resolver->method('getLocale')
             ->willReturn($locale);
-
+        $this->config->method('getValue')->will(
+            $this->returnValueMap(
+                [
+                    ['in_context', null, false],
+                    ['supported_locales', null, 'zh_CN,zh_HK,zh_TW,fr_FR'],
+                ]
+            )
+        );
         $this->assertEquals($expectedLocale, $this->model->getLocale());
     }
 
@@ -71,4 +80,23 @@ public function getLocaleDataProvider(): array
             ['locale' => 'unknown', 'expectedLocale' => 'en_US'],
         ];
     }
+
+    /**
+     * Tests retrieving locales for PayPal Express Smart Buttons.
+     *
+     */
+    public function testGetLocaleForSmartButtons()
+    {
+        $this->resolver->method('getLocale')
+            ->willReturn('zh_Hans_CN');
+        $this->config->method('getValue')->will(
+            $this->returnValueMap(
+                [
+                    ['in_context', null, true],
+                    ['smart_buttons_supported_locales', null, 'zh_CN,zh_HK,zh_TW,fr_FR'],
+                ]
+            )
+        );
+        $this->assertEquals('zh_CN', $this->model->getLocale());
+    }
 }

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

@@ -26,7 +26,7 @@
                 'color' => 'blue',
                 'shape' => 'pillow',
                 'label' => 'installment',
-                'installmentperiod' => 0
+                'period' => 0
             ],
             'isVisibleOnProductPage' => false,
             'isGuestCheckoutAllowed' => true,
@@ -54,7 +54,7 @@
                 'color' => 'blue',
                 'shape' => 'pillow',
                 'label' => 'installment',
-                'installmentperiod' => 0
+                'period' => 0
             ],
             'isVisibleOnProductPage' => false,
             'isGuestCheckoutAllowed' => true,
@@ -134,7 +134,7 @@
                 'color' => 'blue',
                 'shape' => 'pillow',
                 'label' => 'installment',
-                'installmentperiod' => 0
+                'period' => 0
             ],
             'isVisibleOnProductPage' => false,
             'isGuestCheckoutAllowed' => true,

app/code/Magento/Paypal/etc/config.xml

@@ -69,6 +69,8 @@
                 <verify_peer>1</verify_peer>
                 <skip_order_review_step>1</skip_order_review_step>
                 <supported_locales>ar_EG,cs_CZ,da_DK,de_DE,el_GR,en_AU,en_GB,en_IN,en_US,es_ES,es_XC,fi_FI,fr_CA,fr_FR,fr_XC,he_IL,hu_HU,id_ID,it_IT,ja_JP,ko_KR,nl_NL,no_NO,pl_PL,pt_BR,pt_PT,ru_RU,sk_SK,sv_SE,th_TH,zh_CN,zh_HK,zh_TW,zh_XC</supported_locales>
+                <!--For more information seehttps://developer.paypal.com/docs/checkout/reference/customize-sdk/#locale               -->
+                <smart_buttons_supported_locales>en_AD,fr_AD,es_AD,zh_AD,en_AE,fr_AE,es_AE,zh_AE,ar_AE,en_AG,fr_AG,es_AG,zh_AG,en_AI,fr_AI,es_AI,zh_AI,en_AL,en_AM,fr_AM,es_AM,zh_AM,en_AN,fr_AN,es_AN,zh_AN,en_AO,fr_AO,es_AO,zh_AO,es_AR,en_AR, de_AT,en_AT,en_AU,en_AW,fr_AW,es_AW,zh_AW,en_AZ,fr_AZ,es_AZ,zh_AZ,en_BA,en_BB,fr_BB,es_BB,zh_BB,en_BE,nl_BE,fr_BE,fr_BF,en_BF,es_BF,zh_BF,en_BG,ar_BH,en_BH,fr_BH,es_BH,zh_BH,fr_BI,en_BI,es_BI,zh_BI,fr_BJ,en_BJ,es_BJ,zh_BJ,en_BM,fr_BM,es_BM,zh_BM,en_BN,es_BO,en_BO,fr_BO,zh_BO,pt_BR,en_BR,en_BS,fr_BS,es_BS,zh_BS,en_BT,en_BW,fr_BW,es_BW,zh_BW,en_BY,en_BZ,es_BZ,fr_BZ,zh_BZ,en_CA,fr_CA,fr_CD,en_CD,es_CD,zh_CD,en_CG,fr_CG,es_CG,zh_CG,de_CH,fr_CH,en_CH,fr_CI,en_CI,en_CK,fr_CK,es_CK,zh_CK,es_CL,en_CL,fr_CL,zh_CL,fr_CM,en_CM,zh_CN,es_CO,en_CO,fr_CO,zh_CO,es_CR,en_CR,fr_CR,zh_CR,en_CV,fr_CV,es_CV,zh_CV,en_CY,cs_CZ,en_CZ,fr_CZ,es_CZ,zh_CZ,de_DE,en_DE,fr_DJ,en_DJ,es_DJ,zh_DJ,da_DK,en_DK,en_DM,fr_DM,es_DM,zh_DM,es_DO,en_DO,fr_DO,zh_DO,ar_DZ,en_DZ,fr_DZ,es_DZ,zh_DZ,es_EC,en_EC,fr_EC,zh_EC,en_EE,ru_EE,fr_EE,es_EE,zh_EE,ar_EG,en_EG,fr_EG,es_EG,zh_EG,en_ER,fr_ER,es_ER,zh_ER,es_ES,en_ES,en_ET,fr_ET,es_ET,zh_ET,fi_FI,en_FI,fr_FI,es_FI,zh_FI,en_FJ,fr_FJ,es_FJ,zh_FJ,en_FK,fr_FK,es_FK,zh_FK,en_FM,da_FO,en_FO,fr_FO,es_FO,zh_FO,fr_FR,en_FR,fr_GA,en_GA,es_GA,zh_GA,en_GB,en_GD,fr_GD,es_GD,zh_GD,en_GE,fr_GE,es_GE,zh_GE,en_GF,fr_GF,es_GF,zh_GF,en_GI,fr_GI,es_GI,zh_GI,da_GL,en_GL,fr_GL,es_GL,zh_GL,en_GM,fr_GM,es_GM,zh_GM,fr_GN,en_GN,es_GN,zh_GN,en_GP,fr_GP,es_GP,zh_GP,el_GR,en_GR,fr_GR,es_GR,zh_GR,es_GT,en_GT,fr_GT,zh_GT,en_GW,fr_GW,es_GW,zh_GW,en_GY,fr_GY,es_GY,zh_GY,en_HK,zh_HK,es_HN,en_HN,fr_HN,zh_HN,en_HR,hu_HU,en_HU,fr_HU,es_HU,zh_HU,id_ID,en_ID,en_IE,fr_IE,es_IE,zh_IE,he_IL,en_IL,en_IN,en_IS,it_IT,en_IT,en_JM,es_JM,fr_JM,zh_JM,ar_JO,en_JO,fr_JO,es_JO,zh_JO,ja_JP,en_JP,en_KE,fr_KE,es_KE,zh_KE,en_KG,fr_KG,es_KG,zh_KG,en_KH,en_KI,fr_KI,es_KI,zh_KI,fr_KM,en_KM,es_KM,zh_KM,en_KN,fr_KN,es_KN,zh_KN,ko_KR,en_KR,ar_KW,en_KW,fr_KW,es_KW,zh_KW,en_KY,fr_KY,es_KY,zh_KY,en_KZ,fr_KZ,es_KZ,zh_KZ,en_LA,en_LC,fr_LC,es_LC,zh_LC,en_LI,fr_LI,es_LI,zh_LI,en_LK,en_LS,fr_LS,es_LS,zh_LS,en_LT,ru_LT,fr_LT,es_LT,zh_LT,en_LU,de_LU,fr_LU,es_LU,zh_LU,en_LV,ru_LV,fr_LV,es_LV,zh_LV,ar_MA,en_MA,fr_MA,es_MA,zh_MA,fr_MC,en_MC,en_MD,en_ME,en_MG,fr_MG,es_MG,zh_MG,en_MH,fr_MH,es_MH,zh_MH,en_MK,fr_ML,en_ML,es_ML,zh_ML,en_MN,en_MQ,fr_MQ,es_MQ,zh_MQ,en_MR,fr_MR,es_MR,zh_MR,en_MS,fr_MS,es_MS,zh_MS,en_MT,en_MU,fr_MU,es_MU,zh_MU,en_MV,en_MW,fr_MW,es_MW,zh_MW,es_MX,en_MX,en_MY,en_MZ,fr_MZ,es_MZ,zh_MZ,en_NA,fr_NA,es_NA,zh_NA,en_NC,fr_NC,es_NC,zh_NC,fr_NE,en_NE,es_NE,zh_NE,en_NF,fr_NF,es_NF,zh_NF,en_NG,es_NI,en_NI,fr_NI,zh_NI,nl_NL,en_NL,no_NO,en_NO,en_NP,en_NR,fr_NR,es_NR,zh_NR,en_NU,fr_NU,es_NU,zh_NU,en_NZ,fr_NZ,es_NZ,zh_NZ,ar_OM,en_OM,fr_OM,es_OM,zh_OM,es_PA,en_PA,fr_PA,zh_PA,es_PE,en_PE,fr_PE,zh_PE,en_PF,fr_PF,es_PF,zh_PF,en_PG,fr_PG,es_PG,zh_PG,en_PH,pl_PL,en_PL,en_PM,fr_PM,es_PM,zh_PM,en_PN,fr_PN,es_PN,zh_PN,pt_PT,en_PT,en_PW,fr_PW,es_PW,zh_PW,es_PY,en_PY,en_QA,fr_QA,es_QA,zh_QA,ar_QA,en_RE,fr_RE,es_RE,zh_RE,en_RO,fr_RO,es_RO,zh_RO,en_RS,fr_RS,es_RS,zh_RS,ru_RU,en_RU,fr_RW,en_RW,es_RW,zh_RW,ar_SA,en_SA,fr_SA,es_SA,zh_SA,en_SB,fr_SB,es_SB,zh_SB,fr_SC,en_SC,es_SC,zh_SC,sv_SE,en_SE,en_SG,en_SH,fr_SH,es_SH,zh_SH,en_SI,fr_SI,es_SI,zh_SI,en_SJ,fr_SJ,es_SJ,zh_SJ,sk_SK,en_SK,fr_SK,es_SK,zh_SK,en_SL,fr_SL,es_SL,zh_SL,en_SM,fr_SM,es_SM,zh_SM,fr_SN,en_SN,es_SN,zh_SN,en_SO,fr_SO,es_SO,zh_SO,en_SR,fr_SR,es_SR,zh_SR,en_ST,fr_ST,es_ST,zh_ST,es_SV,en_SV,fr_SV,zh_SV,en_SZ,fr_SZ,es_SZ,zh_SZ,en_TC,fr_TC,es_TC,zh_TC,fr_TD,en_TD,es_TD,zh_TD,fr_TG,en_TG,es_TG,zh_TG,th_TH,en_TH,en_TJ,fr_TJ,es_TJ,zh_TJ,en_TM,fr_TM,es_TM,zh_TM,ar_TN,en_TN,fr_TN,es_TN,zh_TN,en_TO,tr_TR,en_TR,en_TT,fr_TT,es_TT,zh_TT,en_TV,fr_TV,es_TV,zh_TV,zh_TW,en_TW,en_TZ,fr_TZ,es_TZ,zh_TZ,en_UA,ru_UA,fr_UA,es_UA,zh_UA,en_UG,fr_UG,es_UG,zh_UG,en_US,fr_US,es_US,zh_US,es_UY,en_UY,fr_UY,zh_UY,en_VA,fr_VA,es_VA,zh_VA,en_VC,fr_VC,es_VC,zh_VC,es_VE,en_VE,fr_VE,zh_VE,en_VG,fr_VG,es_VG,zh_VG,en_VN,en_VU,fr_VU,es_VU,zh_VU,en_WF,fr_WF,es_WF,zh_WF,en_WS,ar_YE,en_YE,fr_YE,es_YE,zh_YE,en_YT,fr_YT,es_YT,zh_YT,en_ZA,fr_ZA,es_ZA,zh_ZA,en_ZM,fr_ZM,es_ZM,zh_ZM,en_ZW</smart_buttons_supported_locales>
                 <client_id>ATDZ9_ECFh-fudesZo4kz3fGTSO1pzuWCS4IjZMq4JKdRK7hQR3Rxyafx39H2fP363WtmlQNYXjUiAae</client_id>
                 <sandbox_client_id>sb</sandbox_client_id>
             </paypal_express>