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

update void sale report and transaction sales

Browse Source
This commit is contained in:
Dev Team
2025-06-30 17:05:10 +06:30
parent 4ba5c607bd
commit 15f51c44a2
7 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/foodcourt/qrpay_controller.rb
View File

@@ -481,7 +481,7 @@ class Foodcourt::QrpayController < BaseFoodcourtController
end
# 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.sale_id, current_user.name, action_by,remark, "SALEVOID")
sale_audit = SaleAudit.record_audit_for_edit(sale.sale_id, current_user.name, action_by,remark, "CANCEL_MMQR_PAYMENT")
# update complete order items in oqs
SaleOrder.where("sale_id = '#{sale.sale_id}'").find_each do |sodr|
@@ -561,7 +561,7 @@ class Foodcourt::QrpayController < BaseFoodcourtController
current_user.name,
action_by,
remark,
"SALEVOID"
"CANCEL_MMQR_PAYMENT"
)
SaleOrder.where(sale_id: sale.sale_id).find_each do |sodr|

4
app/controllers/reports/void_sale_controller.rb
View File

@@ -1,7 +1,7 @@
class Reports::VoidSaleController < BaseReportController
authorize_resource :class => false
def index
from, to = get_date_range_from_params
# @shift_sale_range = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED)
@@ -16,7 +16,7 @@ authorize_resource :class => false
end
end
@sale_data = Sale.get_void_sale(@shift,from,to)
@sale_data = Sale.get_void_sale(@shift, from, to, params[:void_filter])
@from = from
@to = to