Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/booking-integration

# Conflicts:
#	app/Http/Controllers/BookingController.php
#	routes/api.php

tests/Feature/BookingTest.php

@@ -14,11 +14,13 @@ use Auth;
 use Artisan;
 use App\User;
 use App\Booking;
+use App\UserBankSlip;
 
 class BookingTest extends TestCase
 {
     protected $user;
     protected $booking;
+    protected $userBankSlip;
     
     public function setUp()
     {
@@ -28,6 +30,10 @@ class BookingTest extends TestCase
         $this->booking = factory(Booking::class)->create([
             'user_id' => $this->user->id
         ]);
+        $this->userBankSlip = factory(UserBankSlip::class)->create([
+            'book_id' => $this->booking->id
+        ]);
+
     }
 
     public function testPost()
@@ -113,4 +119,11 @@ class BookingTest extends TestCase
             ->json('POST','/api/booking/' . $this->booking->id . '/cancel', [])
             ->assertSuccessful();
     }
+    
+    public function testApproveBankSlip()
+    {
+        $this->actingAs($this->user)
+            ->json('POST','/api/booking/' . $this->booking->id . '/approve-bank-slip', [])
+            ->assertSuccessful();
+    }
 }