git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove conflict data

Browse Source
This commit is contained in:
phyusin
2018-07-12 15:54:30 +06:30
parent 03abeabb4e eef4af4cc6
commit dd4db6d2e7
20 changed files with 67 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/models/sale_audit.rb
View File

@@ -72,7 +72,7 @@ class SaleAudit < ApplicationRecord
sale_audit.sale_id = sale_id
sale_audit.action = "SALEPAYMENT"
sale_audit.action_at = DateTime.now.utc
sale_audit.action_by = Sale.find(sale_id).cashier_id
sale_audit.action_by = action_by
sale_audit.remark = remark
sale_audit.approved_by = action_by
sale_audit.save!
@@ -89,6 +89,17 @@ class SaleAudit < ApplicationRecord
sale_audit.save!
end
def self.record_audit_sale(sale_id, remark, action_by,type)
sale_audit = SaleAudit.new()
sale_audit.sale_id = sale_id
sale_audit.action = type
sale_audit.action_at = DateTime.now.utc
sale_audit.action_by = action_by
sale_audit.remark = remark
sale_audit.approved_by = action_by
sale_audit.save!
end
def self.paymal_search(sale_id)
paymal = SaleAudit.where("sale_id =? and action = 'PAYMAL'",sale_id)
remark = paymal[0].remark.split("}")