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

Fix wrong variable name. Add auth check before upload bankslip and PO. Optimize some code stlye

Browse Source
This commit is contained in:
Too
2018-06-15 17:13:53 +08:00
parent 0ca14574d4
commit 3060aa1c1f
5 changed files with 147 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/BookingController.php
+67 -102
View File
@@ -47,13 +47,7 @@ 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
@@ -114,9 +108,13 @@ class BookingController extends Controller
return response()->json($booking, 201);
}
public function update(Request $request, $book_id)
{
if (!Auth::check())
{
return response()->json(['message'=>'not loggin'],200);
}
$book_id = Booking::find($book_id);
$book_id->account_name = $request->input('account_name');
$book_id->account_num = $request->input('account_num');
@@ -134,98 +132,85 @@ class BookingController extends Controller
public function uploadbankslip(Request $request, $id)
{
$user_bankslip = Booking::where("user_id", Auth::user()->id)->first();
if (!$user_bankslip)
{
return response()->json(['message'=>'Access denied'], 200);
}
$validator = Validator::make($request->all(), [
'bankslip_url' => 'image|mimes:jpg,jpeg,bmp,png'
]);
if($validator->fails())
{
return response()->json(['message'=>'Incorrect format'],200);
}
$unique_image_url = ""; //init variable
if($bankslip_url = $request->file('bankslip_url'))
{
// Get image name and store it
$filename = $bankslip_url->getClientOriginalName();
$input['bankslip_url'] = $filename;
//hash image name
$unique_name = 'bank_slip_' . md5($filename. time());
// Get image extension concentae it with hashed image name
$ext = $bankslip_url->getClientOriginalExtension();
$unique_image_url = $unique_name. '.' .$ext;
//update database
Storage::putFileAs(
'bankslip_url',/*folder name*/ $bankslip_url, $unique_image_url
);
} //end if
else {
return response()->json(['message' => 'No file detected'], 400);
}
$booking = Booking::find($id);
/* Validation*/
if (!$booking || Auth::user()->id != $booking->user_id)
{
return response()->json(['message'=>'Access denied'], 200);
}
$validator = Validator::make($request->all(), [
'bankslip_url' => 'image|mimes:jpg,jpeg,bmp,png'
]);
if($validator->fails())
{
return response()->json(['message'=>'Incorrect format'],200);
}
if(!$bankslip_file = $request->file('bankslip_url'))
{
return response()->json(['message' => 'No file detected'], 400);
}
/* End Validation */
$filename = $bankslip_file->getClientOriginalName();
$ext = $bankslip_file->getClientOriginalExtension();
$input['bankslip_url'] = $filename;
$unique_name = 'bank_slip_' . md5($filename. time());
$unique_image_url = $unique_name. '.' .$ext;
Storage::putFileAs(
'bankslip_url',/*folder name*/ $bankslip_file, $unique_image_url
);
$booking->cust_marking = $request->input('cust_marking');
$booking->bank_slip_type = $request->input('bank_slip_type');
// Create Post
$user_bankslip = new UserBankSlip;
$user_bankslip->book_id = $booking->id;
$user_bankslip->bankslip_url = $unique_image_url;
$user_bankslip->transfer_amount = $request->input('transfer_amount');
$user_bankslip->save();
return response()->json(['message'=>$user_bankslip],200);
return response()->json(['message'=>"Success"],200);
}
public function uploadPurchaseOrder(Request $request, $id)
{
$user_po = Booking::where("user_id", Auth::user()->id)->first();
if (!$user_po)
{
return response()->json(['message'=>'Access denied'], 200);
}
$booking = Booking::find($id);
/* Validation */
if (!$booking || Auth::user()->id != $booking->user_id)
{
return response()->json(['message'=>'Access denied'], 200);
}
$validator = Validator::make($request->all(), [
'image_url' => 'image|mimes:jpg,jpeg,bmp,png'
]);
$validator = Validator::make($request->all(), [
'image_url' => 'image|mimes:jpg,jpeg,bmp,png'
]);
if($validator->fails())
{
return response()->json(['message'=>'Incorrect format'],200);
}
if($validator->fails())
{
return response()->json(['message'=>'Incorrect format'],200);
}
$unique_image_url = ""; // declare variable
if($image_url = $request->file('image_url'))
{
// Get image name and store it
$filename = $image_url->getClientOriginalName();
$input['image_url'] = $filename;
// hash image name
$unique_name = 'purchase_order_' . md5($filename. time());
if(!$user_input_file = $request->file('image_url'))
{
return response()->json(['message' => 'No file detected'], 400);
}
/* End Validation */
// Get image extension concentae it with hashed image name
$ext = $image_url->getClientOriginalExtension();
$unique_image_url = $unique_name. '.' .$ext;
//update database
Storage::putFileAs(
'image_url',/*folder name*/ $image_url, $unique_image_url
);
} //end if
else {
return response()->json(['message' => 'No file detected'], 400);
}
$filename = $user_input_file->getClientOriginalName();
$ext = $user_input_file->getClientOriginalExtension();
$input['image_url'] = $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
);
$booking = Booking::find($id);
$user_po = new PurchaseOrder;
@@ -233,32 +218,12 @@ class BookingController extends Controller
$user_po->book_id = $booking->id;
$user_po->amount = $request->input('amount');
$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);
}