From 7381252c57cc8cff233ff94f2d1110086ca7ad36 Mon Sep 17 00:00:00 2001 From: Nazri Date: Wed, 30 May 2018 13:24:22 +0800 Subject: [PATCH] fix discussion 2 --- app/Http/Controllers/BookingController.php | 24 ++++++++++++---------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php index 4d6975ef..4fc6bcf7 100644 --- a/app/Http/Controllers/BookingController.php +++ b/app/Http/Controllers/BookingController.php @@ -58,7 +58,10 @@ class BookingController extends Controller $svcharge = 20.00; } - $bia = round(($amount + $svcharge) / $rate + (0*($amount + $svcharge)), 2); + $gst = 0*($amount + $svcharge); + + + $bia = round(($amount + $svcharge) / $rate + $gst,2); //gst = 0.00% -> (0*($amount + $svcharge)) //bia = bank in amount in MYR @@ -120,18 +123,17 @@ class BookingController extends Controller // Upload Image $path = $request->file('bankslip_url')->storeAs('public/userbankslip', $fileNameToStore); } else { - return response()->json(['message'=>'No file detected'],200); + return response()->json(['message'=>'No file detected'],400); } - $id = Booking::find($id); - $id->book_id = $request->input('book_id'); - $id->cust_marking = $request->input('cust_marking'); - $id->is_approve = $request->input('is_approve'); - $id->bank_slip_type = $request->input('bank_slip_type'); + $booking = Booking::find($id); + $booking->cust_marking = $request->input('cust_marking'); + $booking->bank_slip_type = $request->input('bank_slip_type'); // Create Post $post = new UserBankSlip; + $post->book_id = $booking->id; $post->transfer_amount = $request->input('transfer_amount'); $post->bankslip_url = $fileNameToStore; $post->save();; @@ -154,17 +156,17 @@ class BookingController extends Controller // Upload Image $path = $request->file('image_url')->storeAs('public/userPurchaseOrder', $fileNameToStore); } else { - return response()->json(['message'=>'No file detected'],200); + return response()->json(['message'=>'No file detected'],400); } - $id = Booking::find($id); - $id->book_id = $request->input('book_id'); + $booking = Booking::find($id); // Create Post $post = new PurchaseOrder; + $post->book_id = $booking->id; $post->amount = $request->input('amount'); $post->image_url = $fileNameToStore; - $post->save();; + $post->save(); } public function update(Request $request, $book_id)