From f04eb88a8658dc0a14558a63020d19c1b52afdf7 Mon Sep 17 00:00:00 2001 From: Omair Saleh Date: Wed, 23 Jan 2019 22:50:00 +0800 Subject: [PATCH] clean migration files to resolve conflict --- ...24_082214_create_user_bank_slips_table.php | 6 ++-- ...28_085925_create_purchase_orders_table.php | 4 +-- ...id_to_booking_id_in_userbankslip_table.php | 31 ---------------- ...18_06_21_025734_supplier_booking_table.php | 4 +-- ...31_create_supplier_booking_items_table.php | 4 +-- ..._rename_booking_foreignkey_in_po_table.php | 34 ------------------ ..._foreignkey_from_supplierbooking_table.php | 34 ------------------ .../2018_12_26_033303_supplier_payments.php | 35 +++++++++++++++++++ 8 files changed, 44 insertions(+), 108 deletions(-) delete mode 100644 database/migrations/2018_06_18_141410_rename_book_id_to_booking_id_in_userbankslip_table.php delete mode 100644 database/migrations/2018_06_28_011717_rename_booking_foreignkey_in_po_table.php delete mode 100644 database/migrations/2018_07_02_104306_rename_booking_foreignkey_from_supplierbooking_table.php create mode 100644 database/migrations/2018_12_26_033303_supplier_payments.php diff --git a/database/migrations/2018_05_24_082214_create_user_bank_slips_table.php b/database/migrations/2018_05_24_082214_create_user_bank_slips_table.php index ed5bb3a5..badbf917 100644 --- a/database/migrations/2018_05_24_082214_create_user_bank_slips_table.php +++ b/database/migrations/2018_05_24_082214_create_user_bank_slips_table.php @@ -19,8 +19,8 @@ class CreateUserBankSlipsTable extends Migration $table->string('bankslip_url')->nullable(); $table->double('transfer_amount')->nullable(); $table->string('cust_marking')->nullable(); - $table->integer('book_id')->unsigned(); - $table->foreign('book_id')->references('id')->on('bookings'); + $table->integer('booking_id')->unsigned(); + $table->foreign('booking_id')->references('id')->on('bookings'); $table->timestamps(); }); @@ -35,7 +35,7 @@ class CreateUserBankSlipsTable extends Migration { Schema::table('user_bank_slips', function(Blueprint $table) { - $table->dropForeign('user_bank_slips_book_id_foreign'); + $table->dropForeign('user_bank_slips_id_foreign'); }); Schema::dropIfExists('user_bank_slips'); diff --git a/database/migrations/2018_05_28_085925_create_purchase_orders_table.php b/database/migrations/2018_05_28_085925_create_purchase_orders_table.php index 0ab7bbe2..e7118e44 100644 --- a/database/migrations/2018_05_28_085925_create_purchase_orders_table.php +++ b/database/migrations/2018_05_28_085925_create_purchase_orders_table.php @@ -17,8 +17,8 @@ class CreatePurchaseOrdersTable extends Migration $table->increments('id'); $table->string('image_url'); $table->double('amount'); - $table->integer('book_id')->unsigned()->nullable; - $table->foreign('book_id')->references('id')->on('bookings'); + $table->integer('booking_id')->unsigned()->nullable; + $table->foreign('booking_id')->references('id')->on('bookings'); $table->timestamps(); }); } diff --git a/database/migrations/2018_06_18_141410_rename_book_id_to_booking_id_in_userbankslip_table.php b/database/migrations/2018_06_18_141410_rename_book_id_to_booking_id_in_userbankslip_table.php deleted file mode 100644 index 9113a2dd..00000000 --- a/database/migrations/2018_06_18_141410_rename_book_id_to_booking_id_in_userbankslip_table.php +++ /dev/null @@ -1,31 +0,0 @@ -renameColumn('book_id', 'booking_id'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - } -} diff --git a/database/migrations/2018_06_21_025734_supplier_booking_table.php b/database/migrations/2018_06_21_025734_supplier_booking_table.php index 2369cf24..0fec1ac0 100644 --- a/database/migrations/2018_06_21_025734_supplier_booking_table.php +++ b/database/migrations/2018_06_21_025734_supplier_booking_table.php @@ -22,8 +22,8 @@ class SupplierBookingTable extends Migration $table->double('amountInRMB'); $table->double('rmbBankAmount'); - $table->integer('book_id')->unsigned(); - $table->foreign('book_id')->references('id')->on('bookings'); + $table->integer('booking_id')->unsigned(); + $table->foreign('booking_id')->references('id')->on('bookings'); $table->integer('supplier_id')->unsigned(); $table->foreign('supplier_id')->references('id')->on('setting_suppliers'); diff --git a/database/migrations/2018_06_25_120731_create_supplier_booking_items_table.php b/database/migrations/2018_06_25_120731_create_supplier_booking_items_table.php index fad1a1c3..f3922f66 100644 --- a/database/migrations/2018_06_25_120731_create_supplier_booking_items_table.php +++ b/database/migrations/2018_06_25_120731_create_supplier_booking_items_table.php @@ -16,8 +16,8 @@ class CreateSupplierBookingItemsTable extends Migration 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->integer('booking_id')->unsigned(); + $table->foreign('booking_id')->references('id')->on('bookings'); $table->double('bank_in_amount'); $table->integer('supplierbooking_id')->unsigned(); $table->foreign('supplierbooking_id')->references('id')->on('supplier_bookings'); diff --git a/database/migrations/2018_06_28_011717_rename_booking_foreignkey_in_po_table.php b/database/migrations/2018_06_28_011717_rename_booking_foreignkey_in_po_table.php deleted file mode 100644 index aa36fdd9..00000000 --- a/database/migrations/2018_06_28_011717_rename_booking_foreignkey_in_po_table.php +++ /dev/null @@ -1,34 +0,0 @@ -dropForeign(['book_id']); - $table->dropColumn('book_id'); - $table->integer('booking_id')->unsigned()->nullable(); - $table->foreign('booking_id')->references('id')->on('bookings'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - } -} diff --git a/database/migrations/2018_07_02_104306_rename_booking_foreignkey_from_supplierbooking_table.php b/database/migrations/2018_07_02_104306_rename_booking_foreignkey_from_supplierbooking_table.php deleted file mode 100644 index 66df713b..00000000 --- a/database/migrations/2018_07_02_104306_rename_booking_foreignkey_from_supplierbooking_table.php +++ /dev/null @@ -1,34 +0,0 @@ -dropForeign(['book_id']); - $table->dropColumn('book_id'); - $table->integer('booking_id')->unsigned()->nullable(); - $table->foreign('booking_id')->references('id')->on('bookings'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - } -} diff --git a/database/migrations/2018_12_26_033303_supplier_payments.php b/database/migrations/2018_12_26_033303_supplier_payments.php new file mode 100644 index 00000000..f807af5a --- /dev/null +++ b/database/migrations/2018_12_26_033303_supplier_payments.php @@ -0,0 +1,35 @@ +double('paid_amount_myr')->default(0); + $table->integer('complete')->default(0); + }); + DB::table('supplier_bookings')->update(['complete' => 1]); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('supplier_bookings', function($table) { + $table->dropColumn('paid_amount_myr'); + $table->dropColumn('complete'); + }); + } +}