cief/exchange
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange.git synced 2026-08-19 04:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing totals to include service charge for x2 payments

Browse Source
This commit is contained in:
Omair Saleh
2019-04-19 15:12:59 +08:00
parent 8d9c6e4072
commit 6e46839414
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/BookingController.php
+7 -11
View File
@@ -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, '.', '');
}