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

update conflic for pull master

Browse Source
This commit is contained in:
Aung Myo
2018-02-23 14:58:35 +06:30
parent 8069ac15ca 77a66d726b
commit ac47501e01
19 changed files with 284 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/origami/void_controller.rb
View File

@@ -3,7 +3,7 @@ class Origami::VoidController < BaseOrigamiController
def overall_void
sale_id = params[:sale_id]
remark = params[:remark]
if Sale.exists?(sale_id)
sale = Sale.find_by_sale_id(sale_id)
@@ -69,12 +69,8 @@ class Origami::VoidController < BaseOrigamiController
end
# FOr Sale Audit
action_by = current_user.id
if table.nil?
remark = "Void Sale ID #{sale_id} | Receipt No #{sale.receipt_no} | Receipt No #{sale.receipt_no} | Table -> nil"
else
remark = "Void Sale ID #{sale_id} | Receipt No #{sale.receipt_no} | Receipt No #{sale.receipt_no} | Table ->#{table.name}"
end
action_by = current_user.name
# remark = "Void Sale ID #{sale_id} | Receipt No #{sale.receipt_no} | Receipt No #{sale.receipt_no} | Table ->#{table.name}"
sale_audit = SaleAudit.record_audit_for_edit(sale_id,sale.cashier_id, action_by,remark,"SALEVOID" )
# For Print