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

app/models/ability.rb

@@ -13,6 +13,8 @@ class Ability
         can :manage, MenuItemInstance
         can :manage, MenuItemOption
         can :manage, SetMenuItem
+        can :manage, ItemSet
+        can :manage, MenuItemSet
         can :manage, OrderQueueStation
         can :manage, Zone
         can :manage, CashierTerminal

app/models/item_set.rb

@@ -4,4 +4,6 @@ class ItemSet < ApplicationRecord
 
 	has_many :menu_instance_item_sets
 	has_many :menu_item_instances, through: :menu_instance_item_sets
+
+	validates_presence_of :name
 end

app/models/menu_item_set.rb

@@ -2,3 +2,8 @@ class MenuItemSet < ApplicationRecord
 	belongs_to :item_set
 	belongs_to :menu_item
 end
+
+# class Settings::MenuItemSet < ApplicationRecord
+#   belongs_to :item_set_id
+#   belongs_to :menu_item_id
+# end