origin pull master

2017-06-03 13:44:10 +06:30
parent 7529d23147
commit 138850fb24
119 changed files with 2531 additions and 462 deletions
--- a/app/models/menu_item.rb
+++ b/app/models/menu_item.rb
@@ -1,10 +1,12 @@
 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, :type, :min_qty, :taxable, :min_selectable_item, :max_selectable_item
+
  default_scope { order('item_code asc') }

  def self.collection