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

fixMergeConflicts3

Browse Source
This commit is contained in:
lonetrinity
2018-09-12 15:51:02 +08:00
parent 8617df285f
commit 245e722ae5
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/BookingController.php
-8
View File
@@ -620,10 +620,6 @@ class BookingController extends Controller
);
if($upload_path){
<<<<<<< HEAD
=======
>>>>>>> 9aaafd24d6527f6f6e60dfeaf2846fbc42363eed
$user_bankslip = $booking->userBankSlip()->first();
// if user bankslip not exist, create new one
@@ -655,16 +651,12 @@ 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;