fix conflit

database/factories/SupplierBookingItemFactory.php

@@ -0,0 +1,9 @@
+<?php
+
+use Faker\Generator as Faker;
+
+$factory->define(App\SupplierBookingItem::class, function (Faker $faker) {
+    return [
+        //
+    ];
+});

database/migrations/2018_06_21_025734_supplier_booking_table.php

@@ -0,0 +1,44 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class SupplierBookingTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('supplier_bookings', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('payment_method');
+            $table->double('transfer_amount');
+            $table->double('rate');
+            $table->double('rebate');
+            $table->double('amountInRMB');
+            $table->double('rmbBankAmount');
+
+            $table->integer('book_id')->unsigned();
+            $table->foreign('book_id')->references('id')->on('bookings');
+
+            $table->integer('supplier_id')->unsigned();
+            $table->foreign('supplier_id')->references('id')->on('setting_suppliers');
+
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('supplier_bookings');
+    }
+}

database/migrations/2018_06_21_034658_supplierbooking_customerbooking_table.php

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

database/migrations/2018_06_25_120731_create_supplier_booking_items_table.php

@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateSupplierBookingItemsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('supplier_booking_items', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('china_bankslip_url');
+            $table->integer('book_id')->unsigned();
+            $table->foreign('book_id')->references('id')->on('bookings');
+            $table->double('bank_in_amount');
+            $table->integer('supplierbooking_id')->unsigned();
+            $table->foreign('supplierbooking_id')->references('id')->on('supplier_bookings');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('supplier_booking_items');
+    }
+}

database/migrations/2018_06_27_035705_make_paymentmethod_nulltable_in_supplierbooking_table.php

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

database/migrations/2018_06_27_081455_add_bookingid_foreignkey_to_chinabankslip_table.php

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

database/migrations/2018_06_28_011717_rename_booking_foreignkey_in_po_table.php

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

database/seeds/DatabaseSeeder.php

@@ -17,6 +17,6 @@ class DatabaseSeeder extends Seeder
         $this->call(UserRoleSeeder::class);
         $this->call(RateTableSeeder::class);
         $this->call(BookTableSeeder::class);     
-        $this->call(SettingCreditSeeder::class);
+        $this->call(CreditTableSeeder::class);  
     }
 }