reset from master

database/.gitignore

@@ -1 +1,3 @@
 *.sqlite
+vendor/composer/autoload_static.php
+package-lock.json

database/migrations/2018_07_02_104306_rename_booking_foreignkey_from_supplierbooking_table.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class RenameBookingForeignkeyFromSupplierbookingTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('supplier_bookings', function($table)
+        {
+            $table->dropForeign(['book_id']);
+            $table->dropColumn('book_id');
+            $table->integer('booking_id')->unsigned();
+            $table->foreign('booking_id')->references('id')->on('bookings');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}

database/migrations/2018_07_03_014020_add_billing_field_to_supplierbooking_table.php

@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddBillingFieldToSupplierbookingTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('supplier_bookings', function($table)
+        {
+            $table->double('billing_amount');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}

database/migrations/2018_07_03_014343_add_salestax_field_to_supplierbooking_table.php

@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddSalestaxFieldToSupplierbookingTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('supplier_bookings', function($table)
+        {
+            $table->double('salestax_amount');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}

database/seeds/BookTableSeeder.php

@@ -27,10 +27,15 @@ class BookTableSeeder extends Seeder
             'bank_address' => 'cyber', 
             'swift_code' => 'qwe123', 
             'cnap' => '123asd',
-            'term' => 'x1',
-            'amount' => 1.2,
+            'term' => 'x1_cash',
+            'amount' => 200,
+            'rmb_book_amount' => 200,
+            'bia' => 189,
+            'rate' => 1.2,
             'rate_id' => $rate->id,
             'user_id' => $user->id,
+            'status' => 2,
+            'admin_status' => 1,
             'created_at' => Carbon::now()->format('Y-m-d H:i:s'),
             'updated_at' => Carbon::now()->format('Y-m-d H:i:s'),
         ]);

database/seeds/SettingCreditSeeder.php

@@ -15,7 +15,7 @@ class SettingCreditSeeder extends Seeder
         DB::table('setting_credits')->insert([
         	'rmb_credit_limit' => '4000',
         	'usd_credit_limit' => '5000',
-        	'time_limit' => '600'
+        	'time_limit' => '6000'
         ]);
     }
 }