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

app/models/ability.rb

@@ -20,9 +20,9 @@ class Ability
         can :manage, Zone
         can :manage, CashierTerminal
         can :manage, Employee
-        can :manage, MembershipSetting
-        can :manage, MembershipAction
-        can :manage, PaymentMethodSetting
+        # can :manage, MembershipSetting
+        # can :manage, MembershipAction
+        # can :manage, PaymentMethodSetting
         can :manage, TaxProfile
         can :manage, PrintSetting
         can :manage, Account
@@ -30,9 +30,26 @@ class Ability
         can :manage, Order
         can :manage, Sale
 
+        can :manage, Customer
+
         can :index, :dailysale
         can :index, :saleitem
 
+        can :add_customer, Customer  
+        can :update_sale_by_customer, Customer  
+
+        can :index, :discount
+        can :create, :discount
+
+        can :show, :payment
+        can :create, :payment
+        can :reprint, :payment
+
+        can :move_dining, :movetable 
+        can :moving, :movetable
+
+        can :move_dining, :moveroom
+
     elsif user.role == "cashier"
 
         can :read, Order

app/models/sale.rb

@@ -22,7 +22,7 @@ class Sale < ApplicationRecord
   "monthly" => 1,
   "yearly" => 2
   }
-
+  SALE_STATUS_OUTSTANDING = "outstanding"
   SALE_STATUS_COMPLETED = "completed"
 
   def generate_invoice_from_booking(booking_id, requested_by)