diff --git a/app/Http/Controllers/ChinaBankSlipController.php b/app/Http/Controllers/ChinaBankSlipController.php index 0391d0fe..11bd4b7d 100644 --- a/app/Http/Controllers/ChinaBankSlipController.php +++ b/app/Http/Controllers/ChinaBankSlipController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use App\ChinaBankSlip; +use App\Booking; use Illuminate\Http\Request; use Illuminate\Support\Facades\Storage; use Validator; @@ -10,8 +11,10 @@ use Validator; class ChinaBankSlipController extends Controller { - public function store(Request $request) - { + public function store(Request $request, $id) + { + $booking = Booking::where('id',$id)->firstOrFail(); + // TODO : put this after check file exist // validate file format $validator = Validator::make($request->all(), [ @@ -34,7 +37,7 @@ class ChinaBankSlipController extends Controller } - if($bankslip_file = $request->hasFile('china_slip_file')){ + if($bankslip_file = $request->file('file')){ $filename = $bankslip_file->getClientOriginalName(); $ext = $bankslip_file->getClientOriginalExtension(); @@ -52,12 +55,10 @@ class ChinaBankSlipController extends Controller } $china_bankslip = new ChinaBankSlip; - $china_bankslip ->actual_transfer_amount = $request->input('actual_transfer_amount'); - $china_bankslip ->date = $request->input('date'); - $china_bankslip ->details = $request->input('details'); - $china_bankslip ->china_bank_slip_path = $fileNameToStore; - $china_bankslip ->save(); - + $china_bankslip->booking_id = $booking->id; + $china_bankslip->china_bank_slip_path = $upload_path; + $china_bankslip->save(); + return response()->json(['message'=>'success'], 201); } diff --git a/database/migrations/2018_06_27_081455_add_bookingid_foreignkey_to_chinabankslip_table.php b/database/migrations/2018_06_27_081455_add_bookingid_foreignkey_to_chinabankslip_table.php new file mode 100644 index 00000000..5a184094 --- /dev/null +++ b/database/migrations/2018_06_27_081455_add_bookingid_foreignkey_to_chinabankslip_table.php @@ -0,0 +1,32 @@ +integer('booking_id')->unsigned(); + $table->foreign('booking_id')->references('id')->on('bookings'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } +} diff --git a/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue b/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue index b7fc1f6e..79e389f4 100644 --- a/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue +++ b/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue @@ -205,10 +205,9 @@
- Click to upload @@ -258,6 +257,7 @@ return { status: 5, loading_btn: false, + booking_id: this.$route.params.id, booking_details: { id: null, amount: null, diff --git a/routes/api.php b/routes/api.php index 4712165c..ace7e778 100644 --- a/routes/api.php +++ b/routes/api.php @@ -44,10 +44,10 @@ Route::group(['middleware' => 'auth:api'], function () { Route::post('booking/{book_id}/cancel', 'BookingController@cancel'); Route::get('/booking', 'BookingController@index'); Route::get('/user', 'UserController@show'); -}); - Route::patch('settings/profile', 'Settings\ProfileController@update'); Route::patch('settings/password', 'Settings\PasswordController@update'); +}); + Route::group(['middleware' => 'guest:api'], function () { @@ -101,7 +101,7 @@ Route::group(['middleware' => ['role:admin']], function() { Route::post('supplier-booking', 'BookingSupplierController@store'); Route::put('supplier-booking/{id}', 'BookingSupplierController@update'); - Route::post('upload-china-bankslip', 'ChinaBankSlipController@store'); + Route::post('/booking/{id}/upload-china-bankslip','ChinaBankSlipController@store'); });