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

solve merge conflict

Browse Source
This commit is contained in:
Mohd Arief
2018-06-12 12:05:07 +08:00
parent a2262ee3c9 6c089b5989
commit ec4d72c316
13 changed files with 449 additions and 11449 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/BookingController.php
+51 -16
View File
@@ -15,20 +15,20 @@ class BookingController extends Controller
*
* @return \Illuminate\Http\Response
*/
public function index()
{
return response()->json(['success' => true, 'message'=> "You have successfully logged out."]);
}
//public function index()
//{
// return response()->json(['success' => true, 'message'=> "You have successfully logged out."]);
//}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
{
return response()->json(['success' => true, 'message'=> "Hohohoho"]);
}
//public function create()
//{
// return response()->json(['success' => true, 'message'=> "Success"]);
//}
/**
* Store a newly created resource in storage.
@@ -64,6 +64,12 @@ class BookingController extends Controller
break;
default:
return response()->json(["success"=>false, "message"=>"Term not found"], 400);
//$rate = "no";
return Response::json(array(
'code' => 422,
'message' => 'Invalid input'
), 422);
break;
}
@@ -73,6 +79,18 @@ class BookingController extends Controller
$svcharge=20.00;
$bia = round(($amount + ($svcharge / $rate)), 2);
$amount = $request->input("amount");
if ($amount >= 10000 && ($term == 'x2_cash' || $term = 'x2_cheque' || $term = 'x2_ba')) {
$svcharge = 0;
}
else {
$svcharge = 20.00;
}
$bia = round(($amount + $svcharge) / $rate + (0*($amount + $svcharge)), 2);
//gst = 0.00% -> (0*($amount + $svcharge))
//bia = bank in amount in MYR
// return $bia;
$user = Auth::user();
$booking = new Booking();
@@ -88,6 +106,22 @@ class BookingController extends Controller
$booking->term = $term;
$booking->amount = $amount;
$booking->rate_id = $rate;
$booking->rmb_book_amount = $request->input('rmb_book_amount');
$booking->rmb_book_pay_method = $request->input('rmb_book_pay_method');
$booking->rmb_book_account_name = $request->input('rmb_book_account_name');
$booking->rmb_book_acc_no = $request->input('rmb_book_acc_no');
$booking->rmb_book_bank_branch = $request->input('rmb_book_bank_branch');
$booking->usd_book_amount = $request->input('usd_book_amount');
$booking->usd_book_pay_method = $request->input('usd_book_pay_method');
$booking->usd_book_company_name = $request->input('usd_book_company_name');
$booking->usd_book_company_address = $request->input('usd_book_company_address');
$booking->usd_book_swift_code = $request->input('usd_book_swift_code');
$booking->usd_book_cnap = $request->input('usd_book_cnap');
$booking->usd_book_bank_branch = $request->input('usd_book_bank_branch');
$booking->verification_status = $request->input('verification_status');
$booking->user()->associate($user);
//$booking->user_id = $request->input('user_id');
$booking->bia = $bia;
@@ -106,11 +140,11 @@ class BookingController extends Controller
* @param int $id
* @return \Illuminate\Http\Response
*/
public function show($id)
{
//public function show($id)
//{
// $booking = Booking::find($id);
return view('booking.index');
}
// return view('booking.index');
//}
/**
* Show the form for editing the specified resource.
@@ -118,10 +152,10 @@ class BookingController extends Controller
* @param int $id
* @return \Illuminate\Http\Response
*/
public function edit($id)
{
//public function edit($id)
//{
//
}
//}
/**
* Update the specified resource in storage.
@@ -147,7 +181,8 @@ class BookingController extends Controller
$book_id->save();
return response()->json(['book_id'=>$book_id],200);
}