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

2017-06-07 14:45:22 +06:30
parent 810a6d8afc ad5d41768d
commit 4323da6589
14 changed files with 37 additions and 21 deletions
--- a/db/migrate/20170331024747_create_accounts.rb
+++ b/db/migrate/20170331024747_create_accounts.rb
--- a/db/migrate/20170331024749_create_menu_items.rb
+++ b/db/migrate/20170331024749_create_menu_items.rb
@@ -10,6 +10,7 @@ class CreateMenuItems < ActiveRecord::Migration[5.0]
      t.string :type, :null => false, :default => "SimpleMenuItem"
      t.references :menu_category, foreign_key: true
      t.references :menu_item, foreign_key: true
+      t.references :account, foreign_key: true
      t.integer :min_qty, :null => false, :default => 1
      t.boolean :taxable, :null => false, :default => true
      t.integer :min_selectable_item, :null => false, :default => 1