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

2017-07-11 11:07:01 +06:30
parent ee33baec02 72aa769490
commit ebf72f7d42
5 changed files with 123 additions and 27 deletions
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -84,6 +84,7 @@ class Ability
        can :create, :discount
        can :remove_discount_items, :discount
        can :remove_all_discount, :discount
+        can :member_discount, :discount

        can :first_bill, :payment
        can :show, :payment
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -208,7 +208,7 @@ class Sale < ApplicationRecord
  end

  #compute - invoice total
-  def compute_by_sale_items(sale_id, sale_itemss, total_discount)
+  def compute_by_sale_items(sale_id, sale_itemss, total_discount,discount_type=nil)
    sale = Sale.find(sale_id)
    sales_items = sale_itemss

@@ -227,6 +227,9 @@ class Sale < ApplicationRecord
    sale.total_amount = subtotal_price
    sale.total_discount = total_discount
    sale.grand_total = (sale.total_amount - sale.total_discount) + sale.total_tax
+    if discount_type == "member_discount"
+      sale.discount_type = discount_type
+    end
    #compute rounding adjustment
    # adjust_rounding