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,7 +358,6 @@ 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/Checkout/view/frontend/web/js/view/billing-address.js

@@ -123,15 +123,12 @@ function (
          * @return {Boolean}
          */
         useShippingAddress: function () {
-            lastSelectedBillingAddress = quote.billingAddress();
-
             if (this.isAddressSameAsShipping()) {
                 selectBillingAddress(quote.shippingAddress());
-                checkoutData.setSelectedBillingAddress(quote.shippingAddress().getKey());
-
-                setBillingAddressAction(globalMessageList);
+                this.updateAddresses();
                 this.isAddressDetailsVisible(true);
             } else {
+                lastSelectedBillingAddress = quote.billingAddress();
                 quote.billingAddress(null);
                 this.isAddressDetailsVisible(false);
             }
@@ -173,7 +170,6 @@ function (
                     checkoutData.setNewCustomerBillingAddress(addressData);
                 }
             }
-            setBillingAddressAction(globalMessageList);
             this.updateAddresses();
         },
 
@@ -241,18 +237,19 @@ function (
          * @return {*}
          */
         getCountryName: function (countryId) {
+            if (lastSelectedBillingAddress && lastSelectedBillingAddress["countryId"] != countryId) {
+                this.updateAddresses();
+            }
+            lastSelectedBillingAddress = quote.billingAddress();
+
             return countryData()[countryId] != undefined ? countryData()[countryId].name : ''; //eslint-disable-line
         },
 
         /**
          * Trigger action to update shipping and billing addresses
          */
         updateAddresses: function () {
-            if (window.checkoutConfig.reloadOnBillingAddress ||
-                !window.checkoutConfig.displayBillingOnPaymentMethod
-            ) {
-                setBillingAddressAction(globalMessageList);
-            }
+            setBillingAddressAction(globalMessageList);
         },
 
         /**

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

@@ -72,7 +72,6 @@ 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
@@ -172,19 +171,4 @@ 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();
-    }
 }