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

Fix conflit

Browse Source
This commit is contained in:
Too
2018-06-14 23:02:24 +08:00
parent 5ce817cd33 c5a509e7b1
commit 3b2b4617cc
35 changed files with 27280 additions and 8948 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/BookingController.php
+36 -41
View File
@@ -19,47 +19,43 @@ class BookingController extends Controller
{
$rates = Rate::all()->last();
$term = $request->input('term');
$rate = 1;
switch($term){
$rate = 1; // default
switch ($term) {
case "x1_cash":
$rate = $rates->x1_cash;
$rate = $rates->x1_cash;
break;
case "x1_cheque":
$rate = $rates->x1_cheque;
$rate = $rates->x1_cheque;
break;
case "x1_ba":
$rate = $rates->x1_ba;
break;
case "x2_cash":
$rate = $rates->x2_cash;
$rate = $rates->x2_cash;
break;
case "x2_cheque":
$rate = $rates->x2_cheque;
$rate = $rates->x2_cheque;
break;
case "x2_ba":
$rate = $rates->x2_ba;
break;
default:
//$rate = "no";
return Response::json(array(
'code' => 422,
'message' => 'Invalid input'
return Response::json(array(
'success' => false,
'message' => 'Invalid input',
), 422);
break;
}
break;
}
//Calculation part
// Calculation Service charge
$amount = $request->input("amount");
//logic : if amount higher than 10,000, no service charge. if amount lower than 10,000, 20.00 service charge
if ($amount >= 10000 && ($term == 'x2_cash' || $term = 'x2_cheque' || $term = 'x2_ba')) {
$svcharge = 0;
} else {
$svcharge = 20.00;
}
else {
$svcharge = 20.00;
}
//initial calculation
$RMBinMYR = (($amount + $svcharge) / $rate);
@@ -111,8 +107,25 @@ class BookingController extends Controller
$booking->save();
return response()->json($booking, 201);
}
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);
}
public function uploadbankslip(Request $request, $id)
@@ -168,7 +181,6 @@ class BookingController extends Controller
$user_bankslip->save();
return response()->json(['message'=>$user_bankslip],200);
}
public function uploadPurchaseOrder(Request $request, $id)
@@ -219,29 +231,12 @@ class BookingController extends Controller
$user_po->save();
return response()->json(['message'=>'Success'],200);
}
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);
}
public function delete(Booking $book_id)
{
$book_id->delete($book_id);
$booking = Booking::where('user_id', Auth::user())->where('id', $book_id)->firstOrFail();
$booking->delete($book_id);
return response()->json($book_id, 204);
}
// TODO : cancel booking feature
}