diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php index 385c37d8..198f6815 100644 --- a/app/Http/Controllers/BookingController.php +++ b/app/Http/Controllers/BookingController.php @@ -47,7 +47,7 @@ class BookingController extends Controller $booking->track_status = "(". $booking->status ."/7)"; $booking->service_charge = 0; - if ($booking->term == "x2_cash" || $booking->term == "x2_cheque" || $booking->term == "x2_ba"){ + if ($booking->term === "x2_cash" || $booking->term === "x2_cheque" || $booking->term === "x2_ba"){ $booking->track_status = "(". $booking->status ."/5)"; if ($booking->amount < 10000){ $booking->service_charge = 20; @@ -112,7 +112,7 @@ class BookingController extends Controller // all x2 until step 5 only $booking->service_charge = 0; - if ($booking->term == "x2_cash" || $booking->term == "x2_cheque" || $booking->term == "x2_ba"){ + if ($booking->term === "x2_cash" || $booking->term === "x2_cheque" || $booking->term === "x2_ba"){ $booking->track_status = "(". $booking->status ."/5)"; if ($booking->amount < 10000){ $booking->service_charge = 20; @@ -149,7 +149,7 @@ class BookingController extends Controller } $booking->service_charge = 0; - if ($booking->term == "x2_cash" || $booking->term == "x2_cheque" || $booking->term == "x2_ba"){ + if ($booking->term === "x2_cash" || $booking->term === "x2_cheque" || $booking->term === "x2_ba"){ $booking->track_status = "(". $booking->admin_status ."/6)"; if ($booking->amount < 10000){ $booking->service_charge = 20; @@ -222,7 +222,7 @@ class BookingController extends Controller $booking->transfer_amount = $booking->bia; $booking->service_charge = 0; - if ($booking->term == "x2_cash" || $booking->term == "x2_cheque" || $booking->term == "x2_ba"){ + if ($booking->term === "x2_cash" || $booking->term === "x2_cheque" || $booking->term === "x2_ba"){ $booking->track_status = "(". $booking->admin_status ."/6)"; if ($booking->amount < 10000){ $booking->service_charge = 20; @@ -282,11 +282,9 @@ class BookingController extends Controller if($invoice){ $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 = 0; - } else { + 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, '.', ''); } @@ -350,9 +348,7 @@ 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 = 0; - } else { + 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, '.', ''); }