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

This commit is contained in:
Yan
2017-06-30 13:34:30 +06:30
21 changed files with 486 additions and 105 deletions

View File

@@ -47,6 +47,7 @@ class Ability
can :remove_discount_items, :discount
can :remove_all_discount, :discount
can :first_bill, :payment
can :show, :payment
can :create, :payment
can :reprint, :payment
@@ -56,6 +57,14 @@ class Ability
can :move_dining, :moveroom
can :edit, :sale_edit
can :item_void, :sale_edit
can :item_void_cancel, :sale_edit
can :cancel_all_void, :sale_edit
can :apply_void, :sale_edit
can :overall_void, :void
elsif user.role == "cashier"
can :read, Order