Merge branch 'developer' of http://47.99.244.21:9999/root/joshine into developer

app/code/Magento/Checkout/view/frontend/web/js/view/summary/shipping.js

@@ -70,7 +70,7 @@ define([
         },
         },
         isSaveShowed: function () {
         isSaveShowed: function () {
             var price =  this.totals()['shipping_amount'];
             var price =  this.totals()['shipping_amount'];
-            if(price != 0)
+            if(price != 0 || quote.shippingSaveMethod() == null)
             {
             {
                 return false;
                 return false;
             }
             }