remove conflict data

This commit is contained in:
phyusin
2018-02-27 14:35:21 +06:30
49 changed files with 1989 additions and 363 deletions

View File

@@ -9,6 +9,7 @@ class CreateEmployees < ActiveRecord::Migration[5.1]
t.datetime :session_expiry
t.datetime :session_last_login
t.string :created_by
t.string :image_path
t.timestamps
end
end

View File

@@ -18,6 +18,7 @@ class CreateCustomers < ActiveRecord::Migration[5.1]
t.string :membership_authentication_code
t.string :customer_type, :default => "Dinein"
t.json :tax_profiles
t.string :image_path
end
end
end

View File

@@ -9,6 +9,7 @@ class CreateCommissioners < ActiveRecord::Migration[5.1]
t.datetime :joined_date
t.datetime :resigned_date
t.boolean :is_active, default: true
t.string :image_path
t.timestamps
end
end

View File

@@ -1,9 +0,0 @@
class AddImagePathToEmployees < ActiveRecord::Migration[5.1]
def change
add_column :employees, :image_path, :string
end
def down
remove_column :image_path
end
end

View File

@@ -1,9 +0,0 @@
class AddImagePathToCustomers < ActiveRecord::Migration[5.1]
def change
add_column :customers, :image_path, :string
end
def down
remove_column :image_path
end
end

View File

@@ -1,9 +0,0 @@
class AddImagePathToCommissioners < ActiveRecord::Migration[5.1]
def change
add_column :commissioners, :image_path, :string
end
def down
remove_column :image_path
end
end