buyer country Changes applied for all paypal sdk methods

Author: glo05363

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

@@ -1586,6 +1586,7 @@ protected function _mapWppFieldset($fieldName)
             case 'api_signature':
             case 'api_cert':
             case 'sandbox_flag':
+            case 'buyer_country':
             case 'use_proxy':
             case 'proxy_host':
             case 'proxy_port':
@@ -1626,6 +1627,7 @@ protected function _mapWpukFieldset($fieldName)
             case 'vendor':
             case 'pwd':
             case 'sandbox_flag':
+            case 'buyer_country':
             case 'use_proxy':
             case 'proxy_host':
             case 'proxy_port':

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

@@ -103,6 +103,7 @@ public function getUrl(): string
                 'client-id' => $this->getClientId(),
                 'locale' => $this->localeResolver->getLocale(),
                 'currency' => $this->storeManager->getStore()->getBaseCurrencyCode(),
+                'buyer-country' => $this->getBuyerCountry(),
             ];
 
             if ($this->areMessagesEnabled()) {
@@ -114,7 +115,6 @@ public function getUrl(): string
                 $params['intent'] = $this->getIntent();
                 $params['merchant-id'] = $this->config->getValue('merchant_id');
                 $params['disable-funding'] = $this->getDisallowedFunding();
-                $params['buyer-country'] = $this->getBuyerCountry();
                 $params = array_replace($params, $this->queryParams);
             }
             $params['components'] = implode(',', $components);

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

@@ -104,8 +104,8 @@ public function testGetConfig(
                 ['merchant_id', null, 'merchant'],
                 ['sandbox_client_id', null, 'sb'],
                 ['sandbox_flag', null, true],
-                ['disable_funding_options', null, $disallowedFunding],
                 ['buyer_country', null, $isBuyerCountryEnabled ? 'US' : ''],
+                ['disable_funding_options', null, $disallowedFunding],
                 ['paymentAction', null, $intent],
                 ['in_context', null, true],
                 [

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

@@ -172,14 +172,14 @@ function generateExpectedPaypalSdkUrl(array $params) : String
                     'client-id' => 'sb',
                     'locale' => 'en_BR',
                     'currency' => 'USD',
+                    'buyer-country' => 'US',
                     'commit' => 'false',
                     'intent' => 'authorize',
                     'merchant-id' => 'merchant',
                     'disable-funding' => implode(
                         ',',
                         ['credit', 'sepa', 'venmo', 'bancontact', 'eps', 'giropay', 'ideal', 'mybank', 'p24', 'sofort']
                     ),
-                    'buyer-country' => 'US',
                     'components' => implode(',', ['messages', 'buttons'])
                 ]
             )

app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml

@@ -55,6 +55,15 @@
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <attribute type="shared">1</attribute>
                 </field>
+                <field id="buyer_country" translate="label" type="select" sortOrder="65" showInDefault="1" showInWebsite="1">
+                    <label>Buyer Country</label>
+                    <config_path>payment/payflow_advanced/buyer_country</config_path>
+                    <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+                    <attribute type="shared">1</attribute>
+                    <depends>
+                        <field id="sandbox_flag">1</field>
+                    </depends>
+                </field>
                 <field id="use_proxy" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1">
                     <label>Use Proxy</label>
                     <config_path>payment/payflow_advanced/use_proxy</config_path>

app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml

@@ -56,6 +56,15 @@
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <attribute type="shared">1</attribute>
                 </field>
+                <field id="buyer_country" translate="label" type="select" sortOrder="55" showInDefault="1" showInWebsite="1">
+                    <label>Buyer Country</label>
+                    <config_path>payment/payflow_link/buyer_country</config_path>
+                    <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+                    <attribute type="shared">1</attribute>
+                    <depends>
+                        <field id="sandbox_flag">1</field>
+                    </depends>
+                </field>
                 <field id="use_proxy" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1">
                     <label>Use Proxy</label>
                     <config_path>payment/payflow_link/use_proxy</config_path>

app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml

@@ -51,6 +51,15 @@
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <attribute type="shared">1</attribute>
                 </field>
+                <field id="buyer_country" translate="label" type="select" sortOrder="65" showInDefault="1" showInWebsite="1">
+                    <label>Buyer Country</label>
+                    <config_path>payment/payflowpro/buyer_country</config_path>
+                    <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+                    <attribute type="shared">1</attribute>
+                    <depends>
+                        <field id="sandbox_flag">1</field>
+                    </depends>
+                </field>
                 <field id="use_proxy" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1">
                     <label>Use Proxy</label>
                     <config_path>payment/payflowpro/use_proxy</config_path>