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

fixMergeConflicts

Browse Source
This commit is contained in:
lonetrinity
2018-09-12 15:45:09 +08:00
parent ced8c02203 9aaafd24d6
commit d8c993ab31
4 changed files with 10538 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/BookingController.php
+7
View File
@@ -620,7 +620,10 @@ class BookingController extends Controller
);
if($upload_path){
<<<<<<< HEAD
=======
>>>>>>> 9aaafd24d6527f6f6e60dfeaf2846fbc42363eed
$user_bankslip = $booking->userBankSlip()->first();
// if user bankslip not exist, create new one
@@ -652,12 +655,16 @@ class BookingController extends Controller
if(!$user_bankslip){
return response()->json(["message"=> "not found"],400);
<<<<<<< HEAD
}
// validate transfer amount exist
if(!$request->input('transfer_amount')){
return response()->json(['message' => 'Please input amount'], 400);
}
=======
}
>>>>>>> 9aaafd24d6527f6f6e60dfeaf2846fbc42363eed
// update booking status
$booking->status = 3;