Resolved merge conflict

This commit is contained in:
Mouhamed Lamine
2018-07-03 11:25:42 +08:00
11 changed files with 2418 additions and 3272 deletions
@@ -328,6 +328,7 @@ class BookingController extends Controller
// $booking->usd_book_bank_branch = $request->input('usd_book_bank_branch');
// $booking->verification_status = $request->input('verification_status');
$booking->save();
//return response()->json('error', 400);
return response()->json($booking, 201);
}