Merge branch 'fix/uploadBankSlip' into 'master'

Fix/upload bank slip

See merge request CIEFWorldwideSdnBhd/exchange!137

app/Http/Controllers/BookingController.php

@@ -193,7 +193,7 @@ class BookingController extends Controller
             })
                 
             ->orderby('updated_at','desc')
-            ->paginate(10);
+            ->paginate(30);
 
 			// reformat to fit frontend structure 
 			foreach ($bookings as $booking) {
@@ -606,6 +606,7 @@ class BookingController extends Controller
 
 
         if($bankslip_file = $request->file('file'))
+        
         {
             /* End Validation */
             $filename = $bankslip_file->getClientOriginalName();

package.json

@@ -48,10 +48,12 @@
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "cross-env": "^5.1.4",
     "eslint": "^4.19.1",
-    "laravel-mix": "^2.1.1",
+    "laravel-mix": "^2.1.14",
     "vue-template-compiler": "^2.5.16",
+    "vuepress": "^0.14.2",
     "webpack": "^3.11.0",
     "webpack-bundle-analyzer": "^2.13.1",
-    "webpack-cli": "^3.0.8"
+    "webpack-cli": "^3.0.8",
+    "webpack-dev-server": "^3.1.8"
   }
 }

resources/assets/js/pages/booking/uploadUserBankSlip.vue

@@ -82,6 +82,7 @@
 				</el-form-item>	
 			</el-form>
 		</div>
+		</div>
 	</el-main>
 </template>
 <style>

resources/assets/js/pages/home.vue

@@ -291,6 +291,7 @@
             <el-button slot-scope="scope" type="text" @click="(event) => { BookingStatus(scope.row.status, scope.row.id, scope.row.term) }"> {{ scope.row.id }}</el-button>
           </el-table-column>
           <el-table-column label="DateTime" prop="created_at" width="180" sortable/>
+          <el-table-column label="Marking" width="120" prop="marking" />
           <el-table-column :filters="[{text: 'X1 cash', value: 'x1_cash'}, {text: 'X1 ba', value: 'x1_ba'}, {text: 'X1 cheque', value: 'x1_cheque'}]" :filter-method="filterHandler" label="Term" prop="term" width="100"/> -->
           <el-table-column label="Rate" width="100" prop="rate" sortable/>
           <el-table-column label="Amount" prop="amount" justify="center" width="110" sortable/>