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

2017-11-28 19:12:02 +06:30
parent 0b03c243ec 900efb3fa6
commit f29a5b95a4
7 changed files with 25 additions and 23 deletions
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -875,7 +875,7 @@ end
 # end

 def grand_total_after_rounding
-    return self.old_grand_total.to_f + self.rounding_adjustment.to_f
+    return self.grand_total.to_f + self.rounding_adjustment.to_f
 end

  def get_cash_amount