Merge branch 'FearlessKiwis-MAGETWO-55301' into MAGETWO-63731-Site-Map

Author: cpartica

app/code/Magento/Checkout/view/frontend/web/js/model/cart/estimate-service.js

@@ -19,7 +19,10 @@ define([
     quote.shippingAddress.subscribe(function () {
         var type = quote.shippingAddress().getType();
 
-        if (quote.isVirtual()) {
+        if (
+            quote.isVirtual() ||
+            window.checkoutConfig.activeCarriers && window.checkoutConfig.activeCarriers.length === 0
+        ) {
             // update totals block when estimated address was set
             totalsProcessors['default'] = totalsDefaultProvider;
             totalsProcessors[type] ?

app/code/Magento/Checkout/view/frontend/web/js/model/default-validation-rules.js

@@ -0,0 +1,21 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([], function () {
+    'use strict';
+
+    return {
+        /**
+         * @return {Object}
+         */
+        getRules: function () {
+            return {
+                'country_id': {
+                    'required': true
+                }
+            };
+        }
+    };
+});

app/code/Magento/Checkout/view/frontend/web/js/model/default-validator.js

@@ -0,0 +1,38 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'mageUtils',
+    './default-validation-rules',
+    'mage/translate'
+], function ($, utils, validationRules, $t) {
+    'use strict';
+
+    return {
+        validationErrors: [],
+
+        /**
+         * @param {Object} address
+         * @return {Boolean}
+         */
+        validate: function (address) {
+            var self = this;
+
+            this.validationErrors = [];
+            $.each(validationRules.getRules(), function (field, rule) {
+                var message;
+
+                if (rule.required && utils.isEmpty(address[field])) {
+                    message = $t('Field ') + field + $t(' is required.');
+
+                    self.validationErrors.push(message);
+                }
+            });
+
+            return !this.validationErrors.length;
+        }
+    };
+});

app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js

@@ -13,6 +13,7 @@ define([
     '../model/address-converter',
     '../action/select-shipping-address',
     './postcode-validator',
+    './default-validator',
     'mage/translate',
     'uiRegistry',
     'Magento_Checkout/js/model/shipping-address/form-popup-state',
@@ -24,6 +25,7 @@ define([
     addressConverter,
     selectShippingAddress,
     postcodeValidator,
+    defaultValidator,
     $t,
     uiRegistry,
     formPopUpState
@@ -36,6 +38,8 @@ define([
         postcodeElement = null,
         postcodeElementName = 'postcode';
 
+    validators.push(defaultValidator);
+
     return {
         validateAddressTimeout: 0,
         validateDelay: 2000,