Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant

db/migrate/20170825093252_createss_commissions.rb

@@ -0,0 +1,15 @@
+class CreateCommissions < ActiveRecord::Migration[5.1]
+  # rake db:migrate:down VERSION=20170825093252
+  def change
+    create_table :commissions, id: false do |t|
+      t.string :commission_id, limit: 16, primary_key: true # custom primary key
+      t.string :name
+      t.string :product_type
+      t.json    :product_code
+      t.string :commission_type
+      t.integer :amount
+      t.boolean :is_active, default: true
+      t.timestamps
+    end
+  end
+end

db/migrate/20171106102000_create_commissions.rb

@@ -3,9 +3,9 @@ class CreateCommissions < ActiveRecord::Migration[5.1]
   def change
     create_table :commissions, id: false do |t|
       t.string :commission_id, limit: 16, primary_key: true # custom primary key
-
+      t.string :name
       t.string :product_type
-      t.string :product_code
+      t.json :product_code
       t.string :commission_type
       t.integer :amount
       t.boolean :is_active, default: true
@@ -13,3 +13,4 @@ class CreateCommissions < ActiveRecord::Migration[5.1]
     end
   end
 end
+