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

Fixed Merge Conflicts

Browse Source
This commit is contained in:
Mouhamed Lamine
2018-07-16 19:32:56 +08:00
parent e868c99440 dcca2d62f6
commit fb102df36c
15 changed files with 627 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/BookingController.php
+21 -6
View File
@@ -97,7 +97,15 @@ class BookingController extends Controller
// TODO : transfer_amount change name to bia
$booking->transfer_amount = $booking->bia;
$booking->track_status = "(". $booking->admin_status ."/7)";
$term = $booking->term;
if($term == "x1_ba" || $term == "x2_cheque"){
$status = $booking->admin_status > 2 ? $booking->admin_status - 2 : $booking->admin_status;
$booking->track_status = "(". $status ."/5)";
}
else{
$booking->track_status = "(". $booking->admin_status ."/7)";
}
switch ($booking->admin_status) {
case 1:
$status_desc = "Waiting customer upload bank slip";
@@ -106,11 +114,15 @@ class BookingController extends Controller
$status_desc = "Verify user bank slip";
break;
case 3:
$status_desc = "Generate supplier booking report";
break;
if($term !== "x1_ba" || $term !== "x2_cheque"){
$status_desc = "Generate supplier booking report";
break;
}
case 4:
$status_desc = "Supplier booking report. Please confirm with your booking.";
break;
if($term !== "x1_ba" || $term !== "x2_cheque"){
$status_desc = "Supplier booking report. Please confirm with your booking.";
break;
}
case 5:
$status_desc = "Please, upload China Bankslip";
break;
@@ -619,7 +631,10 @@ class BookingController extends Controller
// update booking status
$booking->status = 4;
$booking->admin_status = 3;
if($booking->term !== "x1_ba" || $booking->term !== "x2_cheque")
$booking->admin_status = 3;
else
$booking->admin_status = 5;
$booking->save();
return response()->json(['message'=>'Success'],200);