From dc9287490d266a21ae59ba84726f52a6bf230f55 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 19 Apr 2019 15:33:56 +0800
Subject: [PATCH] fixing totals to include service charge for x2 payments

---
 app/Http/Controllers/BookingController.php | 31 +++++-----------------
 resources/assets/js/pages/admin/home.vue   |  2 +-
 resources/assets/js/pages/home.vue         |  2 +-
 3 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index 6acf1b2a..b64d3cec 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -51,8 +51,6 @@ class BookingController extends Controller
                 $booking->track_status = "(". $booking->status ."/5)";
                 if ($booking->amount < 10000){
                     $booking->service_charge = 20;
-                    $booking->amount += 20;
-                    $booking->bia = number_format((float)$booking->bia + ($booking->service_charge/$booking->rate), 2, '.', '');
                 }
             }
 
@@ -114,10 +112,8 @@ class BookingController extends Controller
             $booking->service_charge = 0;
             if ($booking->term === "x2_cash" || $booking->term === "x2_cheque" || $booking->term === "x2_ba"){
                 $booking->track_status = "(". $booking->status ."/5)";
-                if ($booking->amount < 10000){
+                if ($booking->amount < 10000) {
                     $booking->service_charge = 20;
-                    $booking->amount += 20;
-                    $booking->bia = number_format((float)$booking->bia + ($booking->service_charge/$booking->rate), 2, '.', '');
                 }
             }
 
@@ -151,10 +147,8 @@ class BookingController extends Controller
             $booking->service_charge = 0;
             if ($booking->term === "x2_cash" || $booking->term === "x2_cheque" || $booking->term === "x2_ba"){
                 $booking->track_status = "(". $booking->admin_status ."/6)";
-                if ($booking->amount < 10000){
+                if ($booking->amount < 10000) {
                     $booking->service_charge = 20;
-                    $booking->amount += 20;
-                    $booking->bia = number_format((float)$booking->bia + ($booking->service_charge/$booking->rate), 2, '.', '');
                 }
             }
             else{
@@ -224,10 +218,8 @@ class BookingController extends Controller
                 $booking->service_charge = 0;
                 if ($booking->term === "x2_cash" || $booking->term === "x2_cheque" || $booking->term === "x2_ba"){
                     $booking->track_status = "(". $booking->admin_status ."/6)";
-                    if ($booking->amount < 10000){
+                    if ($booking->amount < 10000) {
                         $booking->service_charge = 20;
-                        $booking->amount += 20;
-                        $booking->bia = number_format((float)$booking->bia + ($booking->service_charge/$booking->rate), 2, '.', '');
                     }
                 }
                 else{
@@ -286,7 +278,6 @@ class BookingController extends Controller
             if($booking){
                 if ($booking->amount < 10000 && ($booking->term == 'x2_cash' || $booking->term == 'x2_cheque' || $booking->term == 'x2_ba')) {
                     $booking->service_charge = 20;
-                    $booking->bia = number_format((float)$booking->bia + ($booking->service_charge/$booking->rate), 2, '.', '');
                 }
             }
 
@@ -347,12 +338,10 @@ class BookingController extends Controller
                 $booking->invoice_path = Storage::url($invoice->invoice_path);
             }
 
-            $booking->service_charge = 0;
 
             if($booking){
                 if ($booking->amount < 10000 && ($booking->term == 'x2_cash' || $booking->term == 'x2_cheque' || $booking->term == 'x2_ba')) {
                     $booking->service_charge = 20;
-                    $booking->bia = number_format((float)$booking->bia + ($booking->service_charge/$booking->rate), 2, '.', '');
                 }
             }
 
@@ -418,13 +407,10 @@ class BookingController extends Controller
                 ], 422);
                 break;
         }
-        
+        $svcharge = 0;
         // Service charge (RMB) : if amount higher than 10,000 or term x2 no service charge.
-        if ($amount >= 10000 && ($term == 'x2_cash' || $term == 'x2_cheque' || $term == 'x2_ba')) {
-            $svcharge = 0;
-        } else {
+        if ($amount < 10000 && ($term == 'x2_cash' || $term == 'x2_cheque' || $term == 'x2_ba')) {
             $svcharge = 20;
-            //$svcharge = 0; // UPDATE ON : 15-8-2018 from PM
         }
        
         $subtotal = round(($amount + $svcharge) / $rate, 2);
@@ -761,12 +747,9 @@ class BookingController extends Controller
              ], 422);
              break;
          }
- 
-         if ($amount >= 10000 && ($term == 'x2_cash' || $term == 'x2_cheque' || $term == 'x2_ba')) {
-             $svcharge = 0;
-         } else {
+        $svcharge = 0;
+         if ($amount < 10000 && ($term === 'x2_cash' || $term === 'x2_cheque' || $term === 'x2_ba')) {
              $svcharge = 20;
-             //$svcharge = 0; // UPDATE ON : 15-8-2018 from PM
          }
         
          $subtotal = round(($amount + $svcharge) / $rate,2);
diff --git a/resources/assets/js/pages/admin/home.vue b/resources/assets/js/pages/admin/home.vue
index ab1c9b03..748ebe9a 100644
--- a/resources/assets/js/pages/admin/home.vue
+++ b/resources/assets/js/pages/admin/home.vue
@@ -316,7 +316,7 @@ export default {
     BookingStatus (status, booking_id, term) {
       // TODO : Get booking status from server
       this.status = status
-      switch (this.status) {
+      switch (Number(status)) {
         case 1:
           this.$router.push({
             name: 'booking.admin.booking.detail',
diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue
index b0e972ef..21bdaeaf 100644
--- a/resources/assets/js/pages/home.vue
+++ b/resources/assets/js/pages/home.vue
@@ -784,7 +784,7 @@ export default {
     BookingStatus (status, booking_id, term) {
       // TODO : Get booking status from server
       // this.status = status;
-      switch (status) {
+      switch (Number(status)) {
         case 1:
           this.$router.push({
             name: 'booking.user.upload',