From b3cf440c4bcc5ecdf6c6c6e078fc31b04952d4ee Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Wed, 27 Jun 2018 10:46:15 +0800 Subject: [PATCH] updated supplier booking controller --- .../Controllers/BookingSupplierController.php | 30 ++----------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/app/Http/Controllers/BookingSupplierController.php b/app/Http/Controllers/BookingSupplierController.php index 9b40749a..6c986da3 100644 --- a/app/Http/Controllers/BookingSupplierController.php +++ b/app/Http/Controllers/BookingSupplierController.php @@ -133,35 +133,11 @@ class BookingSupplierController extends Controller } - public function supplierbookingreport(Request $request, $id) + public function report(Request $request, $id) { - $bookingsupplier = BookingSupplier::where("admin_id", Auth::user()->id)->where('id', $id)->first(); - if (!$bookingsupplier) - { - return response()->json(['message'=>'Access denied'], 200); - } + $supplier_booking = Booking::firstOrFail($id)->supplierBooking()->firstOrFail(); - // //get customer booking id, date,amount, rate, total, gst, rebate, bank in amount, beneficiary account number, bank slip. - // return BookingSupplier::find($id); - - // //display report - // $bookingsupplier = BookingSupplier::with (['supplier_bookings' => function($query){ - // $query -> select ('book_id','date','transfer_amount','rate','rebate', 'amountInRMB', 'rmbBankAmount'); - // }])->get(); - - // //get uploaded customer booking bank slip - // $userbankslip = UserBankSlip::with (['user_bank_slips' => function($query){ - // $query -> select ('book_id','bankslip_url'); - // }])->get(); - - // //get active beneficiary account - // $beneficiary = SettingBeneficiary::with (['setting_beneficiaries' => function($query){ - // $query -> select ('bank_name','acc_no'); - // }])->get(); - - $supplier_booking = $booking->supplierBooking()->first(); - $user_bankslip = $booking->userBankSlip()->first(); - + return response()->json($supplier_booking ,200); }