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

@@ -107,7 +107,7 @@ define([
                 }
                 else
                 {
-                    return this.getFormattedPrice(window.checkoutConfig.flatrate_price);
+                    return window.checkoutConfig.flatrate_price;
                 }
             }
             return this.getFormattedPrice(price);
@@ -127,7 +127,7 @@ define([
                 }
                 else
                 {
-                    return '-'+this.getFormattedPrice(window.checkoutConfig.flatrate_price);
+                    return '-'+window.checkoutConfig.flatrate_price;
                 }
             }
             return 0;