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

2018-03-29 19:38:56 +06:30
parent 850c134ed2 d279c548a1
commit 4c9f451e73
4 changed files with 213 additions and 13 deletions
--- a/app/models/sale_item.rb
+++ b/app/models/sale_item.rb
@@ -38,7 +38,8 @@ class SaleItem < ApplicationRecord
      sale_item.product_alt_name = item.product_alt_name
      sale_item.account_id = item.account_id
      sale_item.status = type
-      if type == "foc" || type == "promotion" || type == "void"
+      sale_item.remark = type
+      if type == "foc" || type == "promotion" || type == "void" || type == "waste" || type == "spoile"
        sale_item.qty = qty * (-1)
      else
        sale_item.qty = qty