Resolved merge conflict

.vs/ProjectSettings.json

@@ -0,0 +1,3 @@
+{
+  "CurrentProjectSetting": null
+}

.vs/VSWorkspaceState.json

@@ -0,0 +1,7 @@
+{
+  "ExpandedNodes": [
+    ""
+  ],
+  "SelectedNode": "\\laradock",
+  "PreviewInSolutionExplorer": false
+}

5.0.0-alpha.2

@@ -0,0 +1,2 @@
++ eslint@4.19.1
+added 67 packages and updated 1 package in 41.428s

app/Http/Controllers/BookingController.php

@@ -328,6 +328,7 @@ class BookingController extends Controller
         // $booking->usd_book_bank_branch = $request->input('usd_book_bank_branch');
         // $booking->verification_status = $request->input('verification_status');
         $booking->save();
+        //return response()->json('error', 400);
         return response()->json($booking, 201);
     }
 

package.json

@@ -42,9 +42,11 @@
     "@vue/eslint-config-standard": "^3.0.0-beta.6",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "cross-env": "^5.1.4",
+    "eslint": "^4.19.1",
     "laravel-mix": "^2.1.1",
     "vue-template-compiler": "^2.5.16",
-    "webpack-bundle-analyzer": "^2.11.1",
-    "webpack-cli": "^2.1.3"
+    "webpack": "^3.11.0",
+    "webpack-bundle-analyzer": "^2.13.1",
+    "webpack-cli": "^3.0.8"
   }
 }

resources/assets/js/pages/home.vue

@@ -230,12 +230,11 @@
       </span>
     </el-dialog>
     <!-- Booking_confirmation_popup -->
-
+    
     <br>
     <br>
     <hr>
-
-    <!-- Booking Table -->
+<!-- Booking Table -->
     <el-row :gutter="20">
       <div>
         <el-table :data="bookingTable">
@@ -275,9 +274,17 @@
           </el-table-column>
         </el-table>
       </div>
-    </el-row>
+    </el-row><br><br>
+    <div align="right">
+      <el-button type="primary" size="mini" @click="fetchPaginateBooking(pagination.prev_page_url)" :disabled="!pagination.prev_page_url">
+        Previous
+      </el-button>
+      <span>Page {{pagination.current_page}} of {{pagination.last_page}}</span>
+      <el-button type="primary" size="mini" @click="fetchPaginateBooking(pagination.next_page_url)" :disabled="!pagination.next_page_url">
+        Next
+      </el-button>
+    </div>
     <!-- Booking Table-end -->
-
   </el-main>
 </template>
 <style>
@@ -355,6 +362,8 @@ export default {
       formLabelWidth: '0px',
       bookingTable: [
       ],
+      url: 'api/booking',
+      pagination: [],
       bookingConfirmTable: {
         date: 'undefined',
         marking: 'undefined',
@@ -369,20 +378,30 @@ export default {
     }
   },
   mounted () {
-    axios
-      .get('/api/booking/')
-      .then((response) => {
-        console.log(response)
-        this.bookingTable = response.data.data
-        // loading.close()
-      }).catch((error) => {
-        // loading.close()
-        // this.$router.push({
-        //   name: 'notfound'
-        // })
-      })
+    this.getBooking()
   },
   methods: {
+    getBooking() {
+      let $this = this
+      axios.get(this.url).then(response => {
+        this.bookingTable = response.data.data
+
+        $this.makePagination(response.data)
+      })
+    },
+    makePagination(data){
+      let pagination =  {
+        current_page: data.current_page,
+        last_page: data.last_page,
+        next_page_url: data.next_page_url,
+        prev_page_url: data.prev_page_url
+      }
+      this.pagination = pagination
+    },
+    fetchPaginateBooking(url) {
+      this.url = url
+      this.getBooking()
+    },
     // TODO fetch booking data on load
     formatter (row, column) {
       return row.address
@@ -405,13 +424,6 @@ export default {
       this.dialogFormVisible = true
       this.term = newterm
     },
-    BookingList () {
-      axios.get('api/booking')
-        .then((response) => {
-          console.log(response)
-          this.list = response.data
-        })
-    },
     // Get calculation before submitting booking
     getCalculationValue (formName) {
       this.loading = true
@@ -471,6 +483,13 @@ export default {
           // pass variable to another router
         })
         .catch((error) => {
+          this.loading = false
+          this.$message({
+            showClose: true,
+            message: 'Internal server issues. Please contact support',
+            type: 'error',
+            duration: 10000
+          })
           console.log(error)
           this.loading = false
           this.$message({

vendor/composer/autoload_static.php

@@ -4,7 +4,11 @@
 
 namespace Composer\Autoload;
 
+<<<<<<< HEAD
 class ComposerStaticInite450fcd5b0627496bb38e1386c9a81ad
+=======
+class ComposerStaticInit50cdbea3724e5f1d6267359fe107641a
+>>>>>>> 0afeb0d1ea15af7104fb7bc36d66737aefb8c84e
 {
     public static $files = array (
         '6124b4c8570aa390c21fafd04a26c69f' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php',
@@ -12,6 +16,10 @@ class ComposerStaticInite450fcd5b0627496bb38e1386c9a81ad
         '25072dd6e2470089de65ae7bf11d3109' => __DIR__ . '/..' . '/symfony/polyfill-php72/bootstrap.php',
         '667aeda72477189d0494fecd327c3641' => __DIR__ . '/..' . '/symfony/var-dumper/Resources/functions/dump.php',
         '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
+<<<<<<< HEAD
+=======
+        'a0edc8309cc5e1d60e3047b5df6b7052' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/functions_include.php',
+>>>>>>> 0afeb0d1ea15af7104fb7bc36d66737aefb8c84e
         '2c102faa651ef8ea5874edb585946bce' => __DIR__ . '/..' . '/swiftmailer/swiftmailer/lib/swift_required.php',
         'a0edc8309cc5e1d60e3047b5df6b7052' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/functions_include.php',
         'c964ee0ededf28c96ebd9db5099ef910' => __DIR__ . '/..' . '/guzzlehttp/promises/src/functions_include.php',
@@ -4767,10 +4775,17 @@ class ComposerStaticInite450fcd5b0627496bb38e1386c9a81ad
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
+<<<<<<< HEAD
             $loader->prefixLengthsPsr4 = ComposerStaticInite450fcd5b0627496bb38e1386c9a81ad::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInite450fcd5b0627496bb38e1386c9a81ad::$prefixDirsPsr4;
             $loader->prefixesPsr0 = ComposerStaticInite450fcd5b0627496bb38e1386c9a81ad::$prefixesPsr0;
             $loader->classMap = ComposerStaticInite450fcd5b0627496bb38e1386c9a81ad::$classMap;
+=======
+            $loader->prefixLengthsPsr4 = ComposerStaticInit50cdbea3724e5f1d6267359fe107641a::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit50cdbea3724e5f1d6267359fe107641a::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInit50cdbea3724e5f1d6267359fe107641a::$prefixesPsr0;
+            $loader->classMap = ComposerStaticInit50cdbea3724e5f1d6267359fe107641a::$classMap;
+>>>>>>> 0afeb0d1ea15af7104fb7bc36d66737aefb8c84e
 
         }, null, ClassLoader::class);
     }