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

app/code/Magento/Checkout/Block/Cart/Shipping.php

@@ -134,7 +134,11 @@ class Shipping extends \Magento\Checkout\Block\Cart\AbstractCart
     }
     }
     public function getFlatratePrice()
     public function getFlatratePrice()
     {
     {
-        return $this->_scopeConfigInterface->getValue('carriers/flatrate/price');
+        $full_free = $this->_scopeConfigInterface->getValue('carriers/flatrate/price');
+        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+        $_helper = $objectManager->get('Magento\Framework\Pricing\Helper\Data');
+        $price = $_helper->currency($full_free, true, false);
+        return $price;
     }
     }
     public function getCountryHtmlSelect($defValue = null, $name = 'country_id', $id = 'country', $title = 'Country') {
     public function getCountryHtmlSelect($defValue = null, $name = 'country_id', $id = 'country', $title = 'Country') {
         $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
         $objectManager = \Magento\Framework\App\ObjectManager::getInstance();

app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml

@@ -30,7 +30,7 @@ $flatraPrice = $block->getFlatratePrice();
         $scriptString = <<<script
         $scriptString = <<<script
 
 
             window.checkoutConfig = {$serializedCheckoutConfig};
             window.checkoutConfig = {$serializedCheckoutConfig};
-            window.checkoutConfig.flatrate_price = {$flatraPrice};
+            window.checkoutConfig.flatrate_price = "{$flatraPrice}";
             window.customerData = window.checkoutConfig.customerData;
             window.customerData = window.checkoutConfig.customerData;
             window.isCustomerLoggedIn = window.checkoutConfig.isCustomerLoggedIn;
             window.isCustomerLoggedIn = window.checkoutConfig.isCustomerLoggedIn;
             require([
             require([