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

2018-01-16 14:55:48 +06:30
parent d8c62b0d44 37d01f6903
commit d152d62e80
5 changed files with 7 additions and 5 deletions
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -165,6 +165,7 @@ class Ability
        can :create, :discount
        can :remove_discount_items, :discount
        can :remove_all_discount, :discount
+        can :member_discount, :discount

        can :manage, Customer
        can :manage, DiningQueue
--- a/app/models/order_queue_station.rb
+++ b/app/models/order_queue_station.rb
@@ -78,7 +78,7 @@ class OrderQueueStation < ApplicationRecord
              end
            end
          end
- 
+          
          if oqs.auto_print 
            if oqs_order_items.length > 0     
              print_slip(oqs, order, oqs_order_items)