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

fix conflit

Browse Source
This commit is contained in:
Too
2018-06-14 23:49:27 +08:00
parent fb944428a5 83dfca2ae1
commit 0ca14574d4
2 changed files with 49 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/BookingController.php
+28 -1
View File
@@ -47,7 +47,13 @@ class BookingController extends Controller
break;
}
<<<<<<< HEAD
// Calculation Service charge
=======
// Calculation
// Service charge
>>>>>>> 83dfca2ae18825a69bca7aec5619abf7f4d0671f
$amount = $request->input("amount");
//logic : if amount higher than 10,000, no service charge. if amount lower than 10,000, 20.00 service charge
@@ -229,9 +235,30 @@ class BookingController extends Controller
$user_po->save();
return response()->json(['message'=>'Success'],200);
}
<<<<<<< HEAD
=======
public function update(Request $request, $book_id)
{
$book_id = Booking::find($book_id);
$book_id->account_name = $request->input('account_name');
$book_id->account_num = $request->input('account_num');
$book_id->bank_name = $request->input('bank_name');
$book_id->bank_branch = $request->input('bank_branch');
$book_id->company_name = $request->input('company_name');
$book_id->company_address = $request->input('company_address');
$book_id->bank_address = $request->input('bank_address');
$book_id->swift_code = $request->input('swift_code');
$book_id->cnap = $request->input('cnap');
$book_id->save();
return response()->json(['book_id'=>$book_id],200);
}
>>>>>>> 83dfca2ae18825a69bca7aec5619abf7f4d0671f
public function delete(Booking $book_id)
{
$booking = Booking::where('user_id', Auth::user())->where('id', $book_id)->firstOrFail();
$booking->delete($book_id);
return response()->json($book_id, 204);
}