From 59fc234ea04e75de0b0accfa31ce588c9f71525c Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Sat, 7 Jul 2018 12:06:21 +0800
Subject: [PATCH] updated user has many booking to bookings added index booking
 with user marking added turncate marking when seeding added turncate
 settingmalaysiabank when seeding added marking to user seeder

---
 app/Booking.php                              | 4 ++--
 app/Http/Controllers/BookingController.php   | 9 ++++-----
 app/User.php                                 | 2 +-
 database/seeds/BookTableSeeder.php           | 2 +-
 database/seeds/MarkingSeeder.php             | 1 +
 database/seeds/SettingMalaysiaBankSeeder.php | 1 +
 database/seeds/UsersTableSeeder.php          | 4 ++--
 7 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/Booking.php b/app/Booking.php
index c63969cc..ee0b5126 100644
--- a/app/Booking.php
+++ b/app/Booking.php
@@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Model;
 class Booking extends Model
 {
     // protected $guarded = [];
-    protected $hidden = array('user_id',  
+    protected $hidden = array("user_id",
                                 "rate_id",
                                 "rmb_book_amount",
                                 "rmb_book_pay_method",
@@ -29,7 +29,7 @@ class Booking extends Model
     public $timestamps = true;
     
     public function user(){
-        return $this->belongsTo('app\User');
+        return $this->belongsTo(User::class);
     }
 
     public function supplierBooking(){
diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index f38cb4f9..95b24562 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -20,12 +20,11 @@ class BookingController extends Controller
 
     public function index(){
 		$user = Auth::user();
-        $bookings = Booking::select('id', 'created_at', 'status', 'rate', 'term', 'amount', 'bia', 'verification_status')
+        $bookings = Booking::select('user_id', 'id', 'created_at', 'status', 'rate', 'term', 'amount', 'bia', 'verification_status')
                                     ->where('user_id', $user->id)
                                     ->orderby('updated_at','desc')
                                     ->paginate(10);
 
-
         // reformat to fit frontend structure 
         foreach ($bookings as $booking) {
             // set timeout 
@@ -42,7 +41,7 @@ class BookingController extends Controller
 
             // TODO : transfer_amount change name to bia 
             $booking->transfer_amount = $booking->bia; 
- 
+            
             $booking->track_status = "(". $booking->status ."/7)";
             switch ($booking->status) {
                 case 1:
@@ -69,9 +68,9 @@ class BookingController extends Controller
                 default:
                     $status_desc = "";
             }
-            $booking->status_desc = $status_desc; 
+            $booking->marking = $booking->user->marking;
         }
-
+       
         return $bookings;
 	}
 	
diff --git a/app/User.php b/app/User.php
index 27b460ef..ae87b308 100644
--- a/app/User.php
+++ b/app/User.php
@@ -98,7 +98,7 @@ class User extends Authenticatable implements JWTSubject
         return [];
     }
 
-    public function booking(){
+    public function bookings(){
         return $this->hasMany(Booking::class);
     }
 
diff --git a/database/seeds/BookTableSeeder.php b/database/seeds/BookTableSeeder.php
index b312ebf4..5dfc3fd9 100644
--- a/database/seeds/BookTableSeeder.php
+++ b/database/seeds/BookTableSeeder.php
@@ -35,7 +35,7 @@ class BookTableSeeder extends Seeder
             'rate_id' => $rate->id,
             'user_id' => $user->id,
             'status' => 2,
-            'admin_status' => 1,
+            'admin_status' => 2,
             'created_at' => Carbon::now()->format('Y-m-d H:i:s'),
             'updated_at' => Carbon::now()->format('Y-m-d H:i:s'),
         ]);
diff --git a/database/seeds/MarkingSeeder.php b/database/seeds/MarkingSeeder.php
index eab923a7..6686060a 100644
--- a/database/seeds/MarkingSeeder.php
+++ b/database/seeds/MarkingSeeder.php
@@ -11,6 +11,7 @@ class MarkingSeeder extends Seeder
      */
     public function run()
     {
+        DB::table('markings')->truncate();
         DB::table('markings')->insert([
         	'marking' => 'hehe',
         	'email' => 'hehe@gmail.com'
diff --git a/database/seeds/SettingMalaysiaBankSeeder.php b/database/seeds/SettingMalaysiaBankSeeder.php
index 5fe33b9c..c53dd640 100644
--- a/database/seeds/SettingMalaysiaBankSeeder.php
+++ b/database/seeds/SettingMalaysiaBankSeeder.php
@@ -11,6 +11,7 @@ class SettingMalaysiaBankSeeder extends Seeder
      */
     public function run()
     {
+        DB::table('setting_malaysia_banks')->truncate();
         DB::table('setting_malaysia_banks')->insert([
         	'company_name' => 'CIEF',
         	'bank_name' => 'Maybank',
diff --git a/database/seeds/UsersTableSeeder.php b/database/seeds/UsersTableSeeder.php
index ac5c6584..51ea3589 100644
--- a/database/seeds/UsersTableSeeder.php
+++ b/database/seeds/UsersTableSeeder.php
@@ -16,8 +16,8 @@ class UsersTableSeeder extends Seeder
         DB::table('users')->delete();
         
         $users = array(
-            ['name' => 'User', 'email' => 'user@example.com', 'password' => Hash::make('secret')],
-            ['name' => 'Admin', 'email' => 'admin@example.com', 'password' => Hash::make('secret')],
+            ['name' => 'User', 'marking'=> 'X9', 'email' => 'user@example.com', 'password' => Hash::make('secret')],
+            ['name' => 'Admin', 'marking'=> 'X10', 'email' => 'admin@example.com', 'password' => Hash::make('secret')],
         );
 
         foreach ($users as $user)