fixed upload chinabankslip

removed unused code in bookingcontroller
updated upload chinabankslip frontend
moved some routes into authenticated route list

app/Http/Controllers/BookingController.php

@@ -318,43 +318,33 @@ class BookingController extends Controller
             return response()->json(['message'=>'Image too large, upload files up to 3 MB'], 400);
         }
 
-        if(!$bankslip_file = $request->file('file'))
+        if($bankslip_file = $request->file('file'))
         {
-            $bankslip_file = $request->file('file');
+            /* End Validation */
             $filename = $bankslip_file->getClientOriginalName();
-            $unique_name = 'bank_slip_' . md5($filename. time());
+            $ext = $bankslip_file->getClientOriginalExtension();
 
-            $file = $request->file('file');
-            $ext = $file->getClientOriginalExtension();
-            $input['bankslip_file'] = $filename;
-            Storage::putFileAs(
-                'bankslip_file',/*folder name*/ $file, $unique_name. '.' .$ext
-            );
-            $user_bankslip->bankslip_file = $unique_name. '.' .$ext; //update database
-        } //end if
+
+            $unique_name = 'bank_slip_' . md5($filename. time()); // probably not a good idea 
+            $unique_image_path = $unique_name. '.' .$ext;
+
+            $upload_path = Storage::disk('public')->putFileAs(
+                'user_bankslip', $bankslip_file, $unique_image_path
+            ); 
+
+            $user_bankslip = new UserBankSlip;
+            $user_bankslip->booking_id = $booking->id;
+            $user_bankslip->bankslip_path =  $upload_path;
+            $user_bankslip->transfer_amount = $request->input('transfer_amount');
+            $user_bankslip->save();
+
+
+            return response()->json(['message'=>"Success"],200);   
+        } 
         else {
             return response()->json(['message' => 'No file detected'], 400);
         }
-        /* End Validation */
-        $filename = $bankslip_file->getClientOriginalName();
-        $ext = $bankslip_file->getClientOriginalExtension();
-        $input['file'] = $filename;
-
-        $unique_name = 'bank_slip_' . md5($filename. time()); // probably not a good idea 
-		$unique_image_path = $unique_name. '.' .$ext;
-
-		$upload_path = Storage::disk('public')->putFileAs(
-            'user_bankslip', $bankslip_file, $unique_image_path
-		); 
-
-        $user_bankslip = new UserBankSlip;
-        $user_bankslip->booking_id = $booking->id;
-        $user_bankslip->bankslip_path =  $upload_path;
-        $user_bankslip->transfer_amount = $request->input('transfer_amount');
-        $user_bankslip->save();
-
-
-        return response()->json(['message'=>"Success"],200);
+      
     }
 
     public function updateBankSlipAmount(Request $request, $id){

app/Http/Controllers/ChinaBankSlipController.php

@@ -9,112 +9,56 @@ use Validator;
 
 class ChinaBankSlipController extends Controller
 {
-    /**
-     * Display a listing of the resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function index()
-    {
-        //
-    }
 
-    /**
-     * Show the form for creating a new resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function create()
-    {
-        //
-    }
-
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
     public function store(Request $request)
-    {
-        // Handle File Upload
-        if($request->hasFile('china_bank_slips')){
-            // Get filename with the extension
-            $filenameWithExt = $request->file('china_bank_slips')->getClientOriginalName();
-            // Get just filename
-            $filename = pathinfo($filenameWithExt, PATHINFO_FILENAME);
-            // Get just ext
-            $extension = $request->file('china_bank_slips')->getClientOriginalExtension();
-            // Filename to store
-            $fileNameToStore= $filename.'_'.time().'.'.$extension;
+    {   
+        // TODO : put this after check file exist 
+        // validate file format 
+        $validator = Validator::make($request->all(), [
+            'file'   => 'image|mimes:jpg,jpeg,bmp,png'
+        ]);
 
-            // File size checking
-            $validator = Validator::make($request->all(), [
-                'china_bank_slips'   => 'max:3072'
-            ]);
-            
-            if($validator->fails())
-            {
-                return response()->json(['message'=>'Image too large, upload files up to 3 MB'], 400);
-            }
-            // Upload Image
-            $path = $request->file('china_bank_slips')->storeAs('public/bankslip', $fileNameToStore);
-        } else {
-            $fileNameToStore = 'hello.jpg';
+        if($validator->fails())
+        {
+            return response()->json(['message'=>'Incorrect format'],200);
         }
-        // Create Post
-        $post = new ChinaBankSlip;
-        $post->actual_transfer_amount = $request->input('actual_transfer_amount');
-        $post->date = $request->input('date');
-        $post->details = $request->input('details');
-        $post->china_bank_slip_path = $fileNameToStore;
-        $post->save();
-        return response()->json(['message'=>$post], 200);
-    }
 
 
-    /**
-     * Display the specified resource.
-     *
-     * @param  \App\ChinaBankSlip  $chinaBankSlip
-     * @return \Illuminate\Http\Response
-     */
-    public function show(ChinaBankSlip $chinaBankSlip)
-    {
-        //
+        $validator = Validator::make($request->all(), [
+            'china_bank_slips'   => 'max:3072'
+        ]);
+        
+        if($validator->fails())
+        {
+            return response()->json(['message'=>'Image too large, upload files up to 3 MB'], 400);
+        }
+
+
+        if($bankslip_file = $request->hasFile('china_slip_file')){
+         
+            $filename = $bankslip_file->getClientOriginalName();
+            $ext = $bankslip_file->getClientOriginalExtension();
+            $unique_name = 'cnbank_slip_' . md5($filename. time()); // probably not a good idea 
+            $unique_image_path = $unique_name. '.' .$ext;
+    
+            // Upload Image
+            $upload_path = Storage::disk('public')->putFileAs(
+                'china_bank_slip', $bankslip_file, $unique_image_path
+            ); 
+
+
+        } else {
+            return response()->json(['message'=>'file not found'],200);
+        }
+   
+        $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();
+        
+        return response()->json(['message'=>'success'], 201);
     }
 
-    /**
-     * Show the form for editing the specified resource.
-     *
-     * @param  \App\ChinaBankSlip  $chinaBankSlip
-     * @return \Illuminate\Http\Response
-     */
-    public function edit(ChinaBankSlip $chinaBankSlip)
-    {
-        //
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \App\ChinaBankSlip  $chinaBankSlip
-     * @return \Illuminate\Http\Response
-     */
-    public function update(Request $request, ChinaBankSlip $chinaBankSlip)
-    {
-        //
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param  \App\ChinaBankSlip  $chinaBankSlip
-     * @return \Illuminate\Http\Response
-     */
-    public function destroy(ChinaBankSlip $chinaBankSlip)
-    {
-        //
-    }
 }

resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue

@@ -205,8 +205,12 @@
               <div align="center">
 
                 <!-- upload image -->
-                <el-upload class="upload-demo" action="https://jsonplaceholder.typicode.com/posts/" :on-preview="handlePreview" :on-remove="handleRemove"
-                  :file-list="fileList2" list-type="picture">
+                <el-upload class="upload-demo" action="https://jsonplaceholder.typicode.com/posts/" 
+                  :on-preview="handlePreview" 
+                  :on-remove="handleRemove"
+                  :file-list="fileList2" 
+                  :multiple="false"
+                  list-type="picture">
                   <el-button size="small" type="primary">Click to upload</el-button>
                   <div slot="tip" class="el-upload__tip">jpg/png files with a size less than 3mb</div>
                 </el-upload>
@@ -219,8 +223,8 @@
                   <el-date-picker v-model="chinaSlipForm.date" type="date" placeholder="Pick a day" :picker-options="pickerOptions1">
                   </el-date-picker>
                 </el-form-item>
-                <el-form-item prop="amount">
-                  <el-input v-model="chinaSlipForm.amount" type="text" placeholder="Amount" style="width: 80%" />
+                <el-form-item prop="actual_transfer_amount">
+                  <el-input v-model="chinaSlipForm.actual_transfer_amount" type="text" placeholder="Amount" style="width: 80%" />
                 </el-form-item>
 
                 <el-form-item prop="details">
@@ -263,12 +267,12 @@
         supplier: null,
         supplier_options: null,
         chinaSlipForm: {
-          amount: null,
+          actual_transfer_amount: null,
           date: null,
           details: null,
         },
         rules: {
-          amount: [{
+          actual_transfer_amount: [{
             required: true,
             message: 'Please input amount',
             trigger: 'change'

routes/api.php

@@ -68,6 +68,9 @@ Route::group(['middleware' => ['role:admin']], function() {
 	Route::post('update-rate', 'RateController@store');
 	Route::put('update-rate/{rate}', 'RateController@update');
 	Route::delete('update-rate/{rate}', 'RateController@delete');
+	Route::get('update-rate', 'RateController@index');
+	Route::get('update-rate/{rate}', 'RateController@show');
+
 
 	Route::get('setting-credit', 'SettingCreditController@index');
 	Route::get('setting-credit/{credit}', 'SettingCreditController@show');
@@ -97,15 +100,8 @@ Route::group(['middleware' => ['role:admin']], function() {
 	Route::get('supplier-booking/{id}', 'BookingSupplierController@show');
 	Route::post('supplier-booking', 'BookingSupplierController@store');
 	Route::put('supplier-booking/{id}', 'BookingSupplierController@update');
+
+	Route::post('upload-china-bankslip', 'ChinaBankSlipController@store');
 });
 
-Route::get('update-rate', 'RateController@index');
-Route::get('update-rate/{rate}', 'RateController@show');
-
-
-Route::post('upload-china-bankslip', 'ChinaBankSlipController@store');
-//customer booking
-Route::post('booking/{id}/upload-user-bankslip', 'BookingController@uploadbankslip');
-Route::post('booking/{id}/upload-po', 'BookingController@uploadPurchaseOrder');
-