From de1f6fdeaac78e31c814d27103bf219ec0d2c247 Mon Sep 17 00:00:00 2001
From: Mark Moffat <mark@Marks-MacBook-Pro-2.local>
Date: Sun, 3 Nov 2019 20:04:20 +1030
Subject: [PATCH] Theme fixes

---
 views/layouts/layout.hbs       | 16 ++++++++--------
 views/themes/Cloth/cart.hbs    | 12 ++++++------
 views/themes/Material/cart.hbs | 10 +++++-----
 views/themes/Mono/cart.hbs     | 10 +++++-----
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/views/layouts/layout.hbs b/views/layouts/layout.hbs
index b78d6f1..613586e 100644
--- a/views/layouts/layout.hbs
+++ b/views/layouts/layout.hbs
@@ -90,14 +90,14 @@
                     {{#if admin}}
                         <a class="navbar-brand navbar-brand-image" href="/admin"><img class="img-responsive" src="/images/logo-admin.png"></a>
                     {{else}}
-                        {{#isNull config.cartLogo}}
-                            {{#isNull config.cartTitle}}
+                        {{#isNull @root.config.cartLogo}}
+                            {{#isNull @root.config.cartTitle}}
                                 <a class="navbar-brand" href="/">expressCart</a>
                             {{else}}
-                                <a class="navbar-brand" href="/">{{config.cartTitle}}</a>
+                                <a class="navbar-brand" href="/">{{@root.config.cartTitle}}</a>
                             {{/isNull}}
                         {{else}}
-                            <a class="navbar-brand navbar-brand-image" href="/"><img class="img-responsive" src="{{config.cartLogo}}"></a>
+                            <a class="navbar-brand navbar-brand-image" href="/"><img class="img-responsive" src="{{@root.config.cartLogo}}"></a>
                         {{/isNull}}
                     {{/if}}
 				</div>
@@ -106,15 +106,15 @@
                         {{#unless admin}}
                         {{#ifCond page '!=' 'checkout'}}
                         {{#ifCond page '!=' 'pay'}}
-                            {{#if session.cart}}
-                                <li><a href="/cart" class="menu-btn"><i class="fa fa-shopping-cart" aria-hidden="true"></i> Cart <span class="badge" id="cart-count">{{session.cartTotalItems}}</span></a></li>
+                            {{#if @root.session.cart}}
+                                <li><a href="/cart" class="menu-btn"><i class="fa fa-shopping-cart" aria-hidden="true"></i> Cart <span class="badge" id="cart-count">{{@root.session.cartTotalItems}}</span></a></li>
                                 {{else}}
                                 <li><a href="/cart" class="menu-btn"><i class="fa fa-shopping-cart" aria-hidden="true"></i> Cart <span class="badge" id="cart-count">0</span></a></li>
                             {{/if}}
                         {{/ifCond}}
                         {{/ifCond}}
                         {{/unless}}
-                        {{#if session.user}}
+                        {{#if @root.session.user}}
 							<li><a href="/admin/logout"><i class="fa fa-sign-out" aria-hidden="true"> </i>Logout</a></li>
 						{{/if}}
 					</ul>
@@ -145,7 +145,7 @@
 		<input type="hidden" id="input_notify_message" value="{{message}}">
 		<input type="hidden" id="input_notify_messageType" value="{{messageType}}">
         <input type="hidden" id="cartCheckout" value="{{checkout}}">
-        <input type="hidden" id="cartTheme" value="{{config.theme}}">
+        <input type="hidden" id="cartTheme" value="{{@root.config.theme}}">
 		<div id="notify_message"></div>
 		{{#if showFooter}}
             <footer class="footer">
diff --git a/views/themes/Cloth/cart.hbs b/views/themes/Cloth/cart.hbs
index 6862a76..b441d5f 100644
--- a/views/themes/Cloth/cart.hbs
+++ b/views/themes/Cloth/cart.hbs
@@ -11,7 +11,7 @@
             <div class="panel-heading">Cart contents</div>
             <div class="panel-body cart-body">
                 <div class="container-fluid">
-                    {{#each session.cart}}
+                    {{#each @root.session.cart}}
                     <div class="row cart-row">
                         <div class="col-xs-4 col-md-2 col s4 m2">
                             {{#if productImage}}
@@ -59,13 +59,13 @@
                     {{/each}}
                 </div>
                 <div class="container-fluid">
-                    {{#if session.cart}}
+                    {{#if @root.session.cart}}
                     <div class="row">
                         <div class="cart-contents-shipping col-md-12 col m12 no-pad-right">
-                            {{#ifCond session.shippingCostApplied '===' true}}
+                            {{#ifCond @root.session.shippingCostApplied '===' true}}
                             <div class="text-right">
                                 Shipping:
-                                <strong>{{currencySymbol config.currencySymbol}}{{formatAmount @root.config.flatShipping}}</strong>
+                                <strong>{{currencySymbol @root.config.currencySymbol}}{{formatAmount @root.config.flatShipping}}</strong>
                             </div>
                             {{else}}
                             <div class="text-right">
@@ -75,7 +75,7 @@
                             {{/ifCond}}
                             <div class="text-right">
                                 Total:
-                                <strong>{{currencySymbol config.currencySymbol}}{{formatAmount session.totalCartAmount}}</strong>
+                                <strong>{{currencySymbol @root.config.currencySymbol}}{{formatAmount @root.session.totalCartAmount}}</strong>
                             </div>
                         </div>
                     </div>
@@ -90,7 +90,7 @@
             </div>
         </div>
         <div class="row">
-            {{#if session.cart}}
+            {{#if @root.session.cart}}
             <div class="col-xs-6 col s6 text-left align-right">
                 <button class="btn btn-danger" id="empty-cart" type="button">Empty cart</button>
             </div>
diff --git a/views/themes/Material/cart.hbs b/views/themes/Material/cart.hbs
index 7be7797..7b38560 100644
--- a/views/themes/Material/cart.hbs
+++ b/views/themes/Material/cart.hbs
@@ -10,7 +10,7 @@
         <div class="card">
             <div class="card-content">
                 <span class="card-title">Cart contents</span>
-                {{#each session.cart}}
+                {{#each @root.session.cart}}
                 <div class="row cart-row">
                     <div class="col s4 m2">
                         {{#if productImage}}
@@ -53,10 +53,10 @@
                     </div>
                 </div>
                 {{/each}}
-                {{#if session.cart}}
+                {{#if @root.session.cart}}
                 <div class="row">
                     <div class="cart-contents-shipping col s12 no-pad-right">
-                        {{#ifCond session.shippingCostApplied '===' true}}
+                        {{#ifCond @root.session.shippingCostApplied '===' true}}
                         <div class="text-right">
                             Shipping:
                             <strong>{{currencySymbol config.currencySymbol}}{{formatAmount @root.config.flatShipping}}</strong>
@@ -69,7 +69,7 @@
                         {{/ifCond}}
                         <div class="text-right">
                             Total:
-                            <strong>{{currencySymbol config.currencySymbol}}{{formatAmount session.totalCartAmount}}</strong>
+                            <strong>{{currencySymbol config.currencySymbol}}{{formatAmount @root.session.totalCartAmount}}</strong>
                         </div>
                     </div>
                 </div>
@@ -83,7 +83,7 @@
             </div>
         </div>
         <div class="row">
-            {{#if session.cart}}
+            {{#if @root.session.cart}}
             <div class="col s6 align-right">
                 <button class="btn waves-effect waves-light red darken-3" id="empty-cart" type="button">Empty cart</button>
             </div>
diff --git a/views/themes/Mono/cart.hbs b/views/themes/Mono/cart.hbs
index 4290f29..0d1cc8f 100644
--- a/views/themes/Mono/cart.hbs
+++ b/views/themes/Mono/cart.hbs
@@ -10,7 +10,7 @@
         <div class="card">
             <div class="card-content">
                 <span class="card-title">Cart contents</span>
-                {{#each session.cart}}
+                {{#each @root.session.cart}}
                 <div class="row cart-row">
                     <div class="col s4 m2">
                         {{#if productImage}}
@@ -53,10 +53,10 @@
                     </div>
                 </div>
                 {{/each}}
-                {{#if session.cart}}
+                {{#if @root.session.cart}}
                 <div class="row">
                     <div class="cart-contents-shipping col s12 no-pad-right">
-                        {{#ifCond session.shippingCostApplied '===' true}}
+                        {{#ifCond @root.session.shippingCostApplied '===' true}}
                         <div class="text-right">
                             Shipping:
                             <strong>{{currencySymbol config.currencySymbol}}{{formatAmount @root.config.flatShipping}}</strong>
@@ -69,7 +69,7 @@
                         {{/ifCond}}
                         <div class="text-right">
                             Total:
-                            <strong>{{currencySymbol config.currencySymbol}}{{formatAmount session.totalCartAmount}}</strong>
+                            <strong>{{currencySymbol config.currencySymbol}}{{formatAmount @root.session.totalCartAmount}}</strong>
                         </div>
                     </div>
                 </div>
@@ -83,7 +83,7 @@
             </div>
         </div>
         <div class="row">
-            {{#if session.cart}}
+            {{#if @root.session.cart}}
             <div class="col s6 align-right">
                 <button class="btn waves-effect waves-light red darken-3" id="empty-cart" type="button">Empty cart</button>
             </div>