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

Fix conflit of variable name with master branch.

Browse Source
This commit is contained in:
Too
2018-06-19 13:32:09 +08:00
parent a019ae2616
commit 6a025a6bac
5 changed files with 208 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/BookingController.php
+21 -18
View File
@@ -92,7 +92,6 @@ class BookingController extends Controller
// Bank in amount
$bia = round($RMBinMYR + $gst + $sales_tax + $billing, 2);
$booking = new Booking();
$booking->account_name = $request->input('account_name');
$booking->account_num = $request->input('account_num');
@@ -103,10 +102,12 @@ class BookingController extends Controller
$booking->rate_id = $rates->id;
$booking->rmb_book_amount = $request->input('amount');
$booking->bia = $bia;
//$booking->user_id = $user-;
// $booking->user_id = $user->id;
$booking->user()->associate($user);
$booking->save();
// The test failed due to ->save() before filling up the information at below
// TODO : handle RMB, MYR and USD (we can use exchange type: USDtoMYR, RMBtoMYR vise versa to switch case)
// $booking->rmb_book_pay_method = $request->input('payment_method');
// $booking->rmb_book_account_name = $request->input('rmb_book_account_name');
@@ -127,6 +128,7 @@ class BookingController extends Controller
// $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');
return response()->json($booking, 201);
}
@@ -166,12 +168,12 @@ class BookingController extends Controller
return response()->json(['message'=>'Incorrect format'],200);
}
if(!$bankslip_file = $request->file('file'))
{
return response()->json(['message' => 'No file detected'], 400);
}
/* End Validation */
$filename = $bankslip_file->getClientOriginalName();
$ext = $bankslip_file->getClientOriginalExtension();
$input['file'] = $filename;
@@ -188,6 +190,7 @@ class BookingController extends Controller
$user_bankslip->transfer_amount = $request->input('transfer_amount');
$user_bankslip->save();
return response()->json(['message'=>"Success"],200);
}
@@ -214,7 +217,7 @@ class BookingController extends Controller
}
$validator = Validator::make($request->all(), [
'image_url' => 'image|mimes:jpg,jpeg,bmp,png'
'file' => 'image|mimes:jpg,jpeg,bmp,png'
]);
if($validator->fails())
@@ -222,7 +225,7 @@ class BookingController extends Controller
return response()->json(['message'=>'Incorrect format'],200);
}
if(!$user_input_file = $request->file('image_url'))
if(!$user_input_file = $request->file('file'))
{
return response()->json(['message' => 'No file detected'], 400);
}
@@ -231,11 +234,11 @@ class BookingController extends Controller
$filename = $user_input_file->getClientOriginalName();
$ext = $user_input_file->getClientOriginalExtension();
$input['image_url'] = $filename;
$input['file'] = $filename;
$unique_name = 'purchase_order_' . md5($filename. time());
$unique_image_url = $unique_name. '.' .$ext;
Storage::putFileAs(
'image_url',/*folder name*/ $user_input_file, $unique_image_url
'file',/*folder name*/ $user_input_file, $unique_image_url
);
$user_po = new PurchaseOrder;
@@ -331,48 +334,48 @@ class BookingController extends Controller
public function approveBankSlip(Request $request, $book_id)
{
if (!$Booking = Booking::where('user_id',Auth::user()->id)->where('id',$book_id)->first())
if (!$booking = Booking::where('user_id',Auth::user()->id)->where('id',$book_id)->first())
{
return response()->json(['message'=>'Access denied'], 200);
}
if(!$UserBankSlip = UserBankSlip::where('book_id',$Booking->id)->first())
if(!$userBankSlip = UserBankSlip::where('book_id',$booking->id)->first())
{
return response()->json(['message'=>'Access denied'], 200);
}
// Rejected bankslip cannot be approve again
if($UserBankSlip->is_reject == 1)
if($userBankSlip->is_reject == 1)
{
return response()->json(['message'=>'Bankslip already rejected'],200);
}
$UserBankSlip->is_approve = 1;
$UserBankSlip->save();
$userBankSlip->is_approve = 1;
$userBankSlip->save();
return response()->json(['message'=>'Success'],200);
}
public function rejectBankSlip(Request $request, $book_id)
{
if (!$Booking = Booking::where('user_id',Auth::user()->id)->where('id',$book_id)->first())
if (!$booking = Booking::where('user_id',Auth::user()->id)->where('id',$book_id)->first())
{
return response()->json(['message'=>'Access denied'], 200);
}
if(!$UserBankSlip = UserBankSlip::where('book_id',$Booking->id)->first())
if(!$userBankSlip = UserBankSlip::where('book_id',$booking->id)->first())
{
return response()->json(['message'=>'Access denied'], 200);
}
// approved bankslip cannot be reject again
if($UserBankSlip->is_approve == 1)
if($userBankSlip->is_approve == 1)
{
return response()->json(['message'=>'Bankslip already approved'],200);
}
$UserBankSlip->is_reject = 1;
$UserBankSlip->reject_reason = $request->reject_reason;
$UserBankSlip->save();
$userBankSlip->is_reject = 1;
$userBankSlip->reject_reason = $request->reject_reason;
$userBankSlip->save();
return response()->json(['message'=>'Success'],200);
}