git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'foodcourt' of gitlab.com:code2lab/SXRestaurant into foodcourt

Browse Source
This commit is contained in:
Zin Moe
2020-02-26 16:39:50 +06:30
parent 7e8b6758b8 de7af02338
commit 0715a02495
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/menu_category.rb
View File

@@ -7,7 +7,7 @@ class MenuCategory < ApplicationRecord
has_many :menu_items has_many :menu_items
validates_presence_of :code, :name, :menu, :order_by validates_presence_of :code, :name, :menu, :order_by
validates_uniqueness_of :code validate_uniqueness_of :code, scope: shop_code
default_scope { order('order_by asc') } default_scope { order('order_by asc') }
scope :active, -> {where("is_available = 1")} scope :active, -> {where("is_available = 1")}

2
app/models/menu_item.rb
View File

@@ -14,7 +14,7 @@ class MenuItem < ApplicationRecord
has_and_belongs_to_many :item_sets, join_table: "menu_item_sets" has_and_belongs_to_many :item_sets, join_table: "menu_item_sets"
validates_presence_of :item_code, :name, :type, :min_qty,:account_id validates_presence_of :item_code, :name, :type, :min_qty,:account_id
validates_uniqueness_of :item_code validate_uniqueness_of :item_code, scope: shop_code
default_scope { order('item_code asc') } default_scope { order('item_code asc') }