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

app/models/account.rb

@@ -3,5 +3,7 @@ class Account < ApplicationRecord
 
 	has_many :menu_items
     # belongs_to :lookup , :class_name => "Lookup"
-
+    def self.collection
+	    Account.select("id, title").map { |e| [e.title, e.id] }
+	  end
 end

app/models/menu_item.rb

@@ -1,10 +1,10 @@
 class MenuItem < ApplicationRecord
 
-  #belongs_to :account
   belongs_to :menu_category, :optional => true
   has_many :menu_item_instances
   belongs_to :parent, :class_name => "MenuItem", foreign_key: "menu_item_id", :optional => true
   has_many :children, :class_name => "MenuItem", foreign_key: "menu_item_id"
+  belongs_to :account
 
   validates_presence_of :item_code, :name, :type, :min_qty, :taxable, :min_selectable_item, :max_selectable_item