From e2cf3fecdd0c81fbec5672e06c778bc1c02de78b Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Fri, 20 Jul 2018 11:12:20 +0800
Subject: [PATCH] fix term1 no service charge fix navbar extra </li>

---
 app/Http/Controllers/BookingController.php | 6 +++---
 resources/assets/js/components/Navbar.vue  | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index 5aae8aee..e5f350c3 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -283,7 +283,7 @@ class BookingController extends Controller
         }
         
         // Service charge (RMB) : if amount higher than 10,000, no service charge. if amount lower than 10,000, 20.00 service charge
-         if ($amount >= 10000 && ($term == 'x2_cash' || $term = 'x2_cheque' || $term = 'x2_ba')) {
+         if ($amount >= 10000 && ($term == 'x2_cash' || $term == 'x2_cheque' || $term == 'x2_ba')) {
             $svcharge = 0;
         } else {
             $svcharge = 20.00;
@@ -583,8 +583,8 @@ class BookingController extends Controller
              ], 422);
              break;
          }
- 
-         if ($amount >= 10000 && ($term == 'x2_cash' || $term = 'x2_cheque' || $term = 'x2_ba')) {
+    
+         if (($amount >= 10000) && ($term == 'x2_cash' || $term == 'x2_cheque' || $term == 'x2_ba')) {
              $svcharge = 0;
          } else {
              $svcharge = 20.00;
diff --git a/resources/assets/js/components/Navbar.vue b/resources/assets/js/components/Navbar.vue
index ccbabb91..9d8d5729 100644
--- a/resources/assets/js/components/Navbar.vue
+++ b/resources/assets/js/components/Navbar.vue
@@ -57,7 +57,6 @@
             </div>
           </li>
           </template>
-          </li>
           <!-- Guest -->
           <template v-else>
             <li class="nav-item">