Fixed display of shipping amount in cart & populate through to order

lib/common.js

@@ -378,10 +378,6 @@ const updateConfig = (fields) => {
         settingsFile.emailPort = parseInt(fields.emailPort);
     }
 
-    if(fields.flatShipping){
-        settingsFile.flatShipping = parseInt(fields.flatShipping);
-    }
-
     if(fields.productsPerRow){
         settingsFile.productsPerRow = parseInt(fields.productsPerRow);
     }

routes/order.js

@@ -123,6 +123,7 @@ router.post('/admin/order/create', async (req, res, next) => {
         orderPaymentGateway: 'Instore',
         orderPaymentMessage: 'Your payment was successfully completed',
         orderTotal: req.session.totalCartAmount,
+        orderShipping: req.session.totalCartShipping,
         orderItemCount: req.session.totalCartItems,
         orderProductCount: req.session.totalCartProducts,
         orderEmail: req.body.email || req.session.customerEmail,

routes/payments/adyen.js

@@ -77,6 +77,7 @@ router.post('/checkout_action', async (req, res, next) => {
         orderPaymentGateway: 'Adyen',
         orderPaymentMessage: response.refusalReason,
         orderTotal: req.session.totalCartAmount,
+        orderShipping: req.session.totalCartShipping,
         orderItemCount: req.session.totalCartItems,
         orderProductCount: req.session.totalCartProducts,
         orderEmail: req.session.customerEmail,

routes/payments/authorizenet.js

@@ -60,6 +60,7 @@ router.post('/checkout_action', (req, res, next) => {
             orderPaymentGateway: 'AuthorizeNet',
             orderPaymentMessage: 'Your payment was successfully completed',
             orderTotal: req.session.totalCartAmount,
+            orderShipping: req.session.totalCartShipping,
             orderItemCount: req.session.totalCartItems,
             orderProductCount: req.session.totalCartProducts,
             orderEmail: req.session.customerEmail,

routes/payments/instore.js

@@ -14,6 +14,7 @@ router.post('/checkout_action', async (req, res, next) => {
         orderPaymentGateway: 'Instore',
         orderPaymentMessage: 'Your payment was successfully completed',
         orderTotal: req.session.totalCartAmount,
+        orderShipping: 0,
         orderItemCount: req.session.totalCartItems,
         orderProductCount: req.session.totalCartProducts,
         orderEmail: req.session.customerEmail,

routes/payments/paypal.js

@@ -162,6 +162,7 @@ router.post('/checkout_action', (req, res, next) => {
                 orderPaymentId: payment.id,
                 orderPaymentGateway: 'Paypal',
                 orderTotal: req.session.totalCartAmount,
+                orderShipping: req.session.totalCartShipping,
                 orderItemCount: req.session.totalCartItems,
                 orderProductCount: req.session.totalCartProducts,
                 orderEmail: req.session.customerEmail,

routes/payments/stripe.js

@@ -53,6 +53,7 @@ router.post('/checkout_action', (req, res, next) => {
             orderPaymentGateway: 'Stripe',
             orderPaymentMessage: charge.outcome.seller_message,
             orderTotal: req.session.totalCartAmount,
+            orderShipping: req.session.totalCartShipping,
             orderItemCount: req.session.totalCartItems,
             orderProductCount: req.session.totalCartProducts,
             orderEmail: req.session.customerEmail,
@@ -229,6 +230,7 @@ router.post('/checkout_action_subscription', async (req, res, next) => {
         orderPaymentGateway: 'Stripe',
         orderPaymentMessage: subscription.collection_method,
         orderTotal: req.session.totalCartAmount,
+        orderShipping: req.session.totalCartShipping,
         orderItemCount: req.session.totalCartItems,
         orderProductCount: req.session.totalCartProducts,
         orderEmail: req.session.customerEmail,

views/themes/Cloth/cart.hbs

@@ -56,7 +56,7 @@
                     {{#ifCond @root.session.shippingCostApplied '===' true}}
                     <div class="text-right">
                         {{ @root.__ "Shipping" }}
-                        <strong>{{currencySymbol @root.config.currencySymbol}}{{formatAmount @root.config.flatShipping}}</strong>
+                        <strong>{{currencySymbol @root.config.currencySymbol}}{{formatAmount @root.session.totalCartShipping}}</strong>
                     </div>
                     {{else}}
                     <div class="text-right">

views/themes/Cloth/checkout-payment.hbs

@@ -30,7 +30,7 @@
                                     Standard shipping 
                                 </div>
                                 <div class="col-md-6">
-                                    <span><strong>{{currencySymbol @root.config.currencySymbol}}{{formatAmount @root.config.flatShipping}}</strong></span>
+                                    <span><strong>{{currencySymbol @root.config.currencySymbol}}{{formatAmount @root.session.totalCartShipping}}</strong></span>
                                     <span class="float-right"><a href="/checkout/shipping">Change</a></span>
                                 </div>
                             </div>

views/themes/Cloth/checkout-shipping.hbs

@@ -15,7 +15,7 @@
                     {{#unless @root.session.shippingOptions}}
                         <ul class="list-group">
                             {{#if @root.session.shippingCostApplied}}
-                            <li class="list-group-item">Standard shipping <span class="float-right"><strong>{{currencySymbol @root.config.currencySymbol}}{{formatAmount @root.config.flatShipping}}</strong></span></li>
+                            <li class="list-group-item">Standard shipping <span class="float-right"><strong>{{currencySymbol @root.config.currencySymbol}}{{formatAmount @root.session.totalCartShipping}}</strong></span></li>
                             {{else}}
                             <li class="list-group-item">FREE shipping <span class="float-right"></li>
                             {{/if}}