From 385372e3dda955f043ab1520c9a1ed7770f98113 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Wed, 20 Jun 2018 22:54:31 +0800
Subject: [PATCH] added rate to booking table

---
 app/Http/Controllers/BookingController.php    |  5 ++-
 .../2018_06_20_145105_add_rate_to_booking.php | 33 +++++++++++++++++++
 resources/assets/js/pages/home.vue            | 31 ++++++++---------
 routes/api.php                                |  4 +--
 routes/web.php                                |  2 +-
 5 files changed, 56 insertions(+), 19 deletions(-)
 create mode 100644 database/migrations/2018_06_20_145105_add_rate_to_booking.php

diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index e43a7bcf..30ded9c2 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -17,7 +17,10 @@ class BookingController extends Controller
 {
 
     public function index(){
-        $booking = Booking::where('user_id',Auth::user()->id)->get();
+        $booking = Booking::select('bookings.id', 'rates.bookings.term')
+                            ->leftJoin('rates', 'bookings.rate_id', '=', 'rates.id')
+                            ->where('user_id',Auth::user()->id)
+                            ->get();
         return $booking;
     }
 
diff --git a/database/migrations/2018_06_20_145105_add_rate_to_booking.php b/database/migrations/2018_06_20_145105_add_rate_to_booking.php
new file mode 100644
index 00000000..f74e2fb8
--- /dev/null
+++ b/database/migrations/2018_06_20_145105_add_rate_to_booking.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddRateToBooking extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('bookings', function (Blueprint $table) {
+            $table->double('rate')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('bookings', function (Blueprint $table) {
+                $table->dropColumn('rate');
+            // $table->dropColumn('reject_reason');
+        });   
+    }
+}
\ No newline at end of file
diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue
index 96985ec6..7d9d464c 100644
--- a/resources/assets/js/pages/home.vue
+++ b/resources/assets/js/pages/home.vue
@@ -434,22 +434,23 @@
       }
     },
     mounted(){
-    axios
-      .get('/api/booking/')
-      .then((response) => {
-        console.log(response)
-        this.booking.amount = response.data.amount
-        this.booking.bankin_amount = response.data.bia
-        this.booking.timeout = response.data.timeout * 1000
-        this.start = true;
-        loading.close()
-      }).catch((error) => {
-        console.log(error)
-        loading.close()
-        this.$router.push({
-          name: 'notfound'
+      axios
+        .get('/api/booking/')
+        .then((response) => {
+          this.bookingTable = response
+          console.log(response)
+          // this.booking.amount = response.data.amount
+          // this.booking.bankin_amount = response.data.bia
+          // this.booking.timeout = response.data.timeout * 1000
+          // this.start = true;
+          //loading.close()
+        }).catch((error) => {
+          // console.log(error)
+          // loading.close()
+          // this.$router.push({
+          //   name: 'notfound'
+          // })
         })
-      })
     },
     methods: {
       // TODO fetch booking data on load 
diff --git a/routes/api.php b/routes/api.php
index f68d606c..797b7e19 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -26,8 +26,8 @@ Route::middleware('auth:api')->get('/user', function (Request $request) {
 //    return $request->user();
 //});
 Route::group(['middleware' => 'auth:api'], function () {
-	Route::post('logout', 'Auth\LoginController@logout');
-
+    Route::post('logout', 'Auth\LoginController@logout');
+    
 	/*Route for the booking */
 	Route::get('/booking/{book_id}', 'BookingController@show');
 	Route::put('/booking/{book_id}', 'BookingController@update');
diff --git a/routes/web.php b/routes/web.php
index 218f4086..9b72ec26 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -17,4 +17,4 @@ Route::get('/', 'WelcomeController@index');
 
 Auth::routes();
 
-//Route::get('/home', 'HomeController@index')->name('home');
+Route::get('/home', 'HomeController@index')->name('home');