ACP2E-862: Cash on Delivery method is visible even if it is not allowed for that particular country

Author: pradeep1819

app/code/Magento/Checkout/Model/DefaultConfigProvider.php

@@ -358,6 +358,7 @@ public function getConfig()
         $output['originCountryCode'] = $this->getOriginCountryCode();
         $output['paymentMethods'] = $this->getPaymentMethods();
         $output['autocomplete'] = $this->isAutocompleteEnabled();
+        $output['displayBillingOnPaymentMethod'] = $this->checkoutHelper->isDisplayBillingOnPaymentMethodAvailable();
         return $this->configPostProcessor->process($output);
     }
 

app/code/Magento/Tax/Model/TaxConfigProvider.php

@@ -8,6 +8,7 @@
 use Magento\Checkout\Model\ConfigProviderInterface;
 use Magento\Tax\Helper\Data as TaxHelper;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Checkout\Model\Session as CheckoutSession;
 
 class TaxConfigProvider implements ConfigProviderInterface
 {
@@ -26,23 +27,31 @@ class TaxConfigProvider implements ConfigProviderInterface
      */
     protected $scopeConfig;
 
+    /**
+     * @var CheckoutSession
+     */
+    protected $checkoutSession;
+
     /**
      * @param TaxHelper $taxHelper
      * @param Config $taxConfig
+     * @param CheckoutSession $checkoutSession
      * @param ScopeConfigInterface $scopeConfig
      */
     public function __construct(
         TaxHelper $taxHelper,
         Config $taxConfig,
+        CheckoutSession $checkoutSession,
         ScopeConfigInterface $scopeConfig
     ) {
         $this->taxHelper = $taxHelper;
         $this->taxConfig = $taxConfig;
+        $this->checkoutSession = $checkoutSession;
         $this->scopeConfig = $scopeConfig;
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public function getConfig()
     {
@@ -63,6 +72,7 @@ public function getConfig()
             'includeTaxInGrandTotal' => $this->isTaxDisplayedInGrandTotal(),
             'isFullTaxSummaryDisplayed' => $this->isFullTaxSummaryDisplayed(),
             'isZeroTaxDisplayed' => $this->taxConfig->displayCartZeroTax(),
+            'reloadOnBillingAddress' => $this->reloadOnBillingAddress(),
             'defaultCountryId' => $this->scopeConfig->getValue(
                 \Magento\Tax\Model\Config::CONFIG_XML_PATH_DEFAULT_COUNTRY,
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
@@ -162,4 +172,19 @@ public function isTaxDisplayedInGrandTotal()
     {
         return $this->taxConfig->displayCartTaxWithGrandTotal();
     }
+
+    /**
+     * Reload totals(taxes) on billing address update
+     *
+     * @return bool
+     */
+    protected function reloadOnBillingAddress()
+    {
+        $quote = $this->checkoutSession->getQuote();
+        $configValue = $this->scopeConfig->getValue(
+            Config::CONFIG_XML_PATH_BASED_ON,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+        return 'billing' == $configValue || $quote->isVirtual();
+    }
 }

app/code/Magento/Tax/Test/Unit/Model/TaxConfigProviderTest.php

@@ -7,6 +7,7 @@
 
 namespace Magento\Tax\Test\Unit\Model;
 
+use Magento\Checkout\Model\Session;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Quote\Model\Quote;
 use Magento\Store\Model\ScopeInterface;
@@ -28,6 +29,11 @@ class TaxConfigProviderTest extends TestCase
      */
     protected $taxConfigMock;
 
+    /**
+     * @var MockObject
+     */
+    protected $checkoutSessionMock;
+
     /**
      * @var MockObject
      */
@@ -47,11 +53,14 @@ protected function setUp(): void
     {
         $this->taxHelperMock = $this->createMock(Data::class);
         $this->taxConfigMock = $this->createMock(Config::class);
+        $this->checkoutSessionMock = $this->createMock(Session::class);
         $this->scopeConfigMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
         $this->quoteMock = $this->createMock(Quote::class);
+        $this->checkoutSessionMock->expects($this->any())->method('getQuote')->willReturn($this->quoteMock);
         $this->model = new TaxConfigProvider(
             $this->taxHelperMock,
             $this->taxConfigMock,
+            $this->checkoutSessionMock,
             $this->scopeConfigMock
         );
     }
@@ -133,6 +142,7 @@ public function getConfigDataProvider()
                     'includeTaxInGrandTotal' => 1,
                     'isFullTaxSummaryDisplayed' => 1,
                     'isZeroTaxDisplayed' => 1,
+                    'reloadOnBillingAddress' => false,
                     'defaultCountryId' => 'US',
                     'defaultRegionId' => 12,
                     'defaultPostcode' => '*',
@@ -161,6 +171,7 @@ public function getConfigDataProvider()
                     'includeTaxInGrandTotal' => 1,
                     'isFullTaxSummaryDisplayed' => 1,
                     'isZeroTaxDisplayed' => 1,
+                    'reloadOnBillingAddress' => true,
                     'defaultCountryId' => 'US',
                     'defaultRegionId' => 12,
                     'defaultPostcode' => '*',
@@ -189,6 +200,7 @@ public function getConfigDataProvider()
                     'includeTaxInGrandTotal' => 1,
                     'isFullTaxSummaryDisplayed' => 1,
                     'isZeroTaxDisplayed' => 1,
+                    'reloadOnBillingAddress' => true,
                     'defaultCountryId' => 'US',
                     'defaultRegionId' => 12,
                     'defaultPostcode' => '*',
@@ -217,6 +229,7 @@ public function getConfigDataProvider()
                     'includeTaxInGrandTotal' => 1,
                     'isFullTaxSummaryDisplayed' => 1,
                     'isZeroTaxDisplayed' => 1,
+                    'reloadOnBillingAddress' => true,
                     'defaultCountryId' => 'US',
                     'defaultRegionId' => 12,
                     'defaultPostcode' => '*',
@@ -245,6 +258,7 @@ public function getConfigDataProvider()
                     'includeTaxInGrandTotal' => 1,
                     'isFullTaxSummaryDisplayed' => 1,
                     'isZeroTaxDisplayed' => 1,
+                    'reloadOnBillingAddress' => false,
                     'defaultCountryId' => 'US',
                     'defaultRegionId' => 12,
                     'defaultPostcode' => '*',
@@ -273,6 +287,7 @@ public function getConfigDataProvider()
                     'includeTaxInGrandTotal' => 1,
                     'isFullTaxSummaryDisplayed' => 1,
                     'isZeroTaxDisplayed' => 1,
+                    'reloadOnBillingAddress' => false,
                     'defaultCountryId' => 'US',
                     'defaultRegionId' => 12,
                     'defaultPostcode' => '*',
@@ -301,6 +316,7 @@ public function getConfigDataProvider()
                     'includeTaxInGrandTotal' => 1,
                     'isFullTaxSummaryDisplayed' => 1,
                     'isZeroTaxDisplayed' => 1,
+                    'reloadOnBillingAddress' => false,
                     'defaultCountryId' => 'US',
                     'defaultRegionId' => null,
                     'defaultPostcode' => '*',