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

2017-12-28 18:05:44 +06:30
parent d58f7d1605 c8d31e4523
commit c9f230fa70
7 changed files with 26 additions and 14 deletions
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -247,6 +247,7 @@ class Sale < ApplicationRecord

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