Changes for all merchant countries

glo05363 · glo05363 · commit 900b536f83f2 · 2021-11-08T16:35:27.000+05:30
diff --git a/app/code/Magento/Paypal/Model/SdkUrl.php b/app/code/Magento/Paypal/Model/SdkUrl.php
@@ -175,7 +175,7 @@ private function getClientId()
      *
      * @return string
      */
-    private function getBuyerCountry(): string
+    private function getBuyerCountry(): ?string
     {
         return (int)$this->config->getValue('sandbox_flag') ? $this->config->getValue('buyer_country') : '';
     }
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml
@@ -31,6 +31,7 @@
                 <field id="api_cert" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/api_cert" />
                 <field id="api_wizard" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/api_wizard" />
                 <field id="sandbox_flag" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/sandbox_flag" />
+                <field id="buyer_country" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/buyer_country" />
                 <field id="use_proxy" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/use_proxy" />
                 <field id="proxy_host" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/proxy_host" />
                 <field id="proxy_port" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/proxy_port" />

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ private function getClientId()`
`175`	`175`	`*`
`176`	`176`	`* @return string`
`177`	`177`	`*/`
`178`		`- private function getBuyerCountry(): string`
	`178`	`+ private function getBuyerCountry(): ?string`
`179`	`179`	`{`
`180`	`180`	`return (int)$this->config->getValue('sandbox_flag') ? $this->config->getValue('buyer_country') : '';`
`181`	`181`	`}`