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

13
app/models/sale.rb
View File

@@ -1330,20 +1330,29 @@ def self.get_by_shift_sale_credit_payment(shift_sale_range,shift,from,to,filter,
credits = credits.group("sale_payments.sale_payment_id, sales_sale_payments.sale_id")
end
def self.get_void_sale(shift,from,to)
def self.get_void_sale(shift,from,to, status)
sale_arr = Array.new
query = Sale.select("sales.receipt_no,sales.receipt_date, sales.payment_status, sales.sale_status,sales.total_amount,sales.grand_total, sales.rounding_adjustment")
query = Sale.select("sales.sale_id,sales.receipt_no,sales.receipt_date, sales.payment_status, sales.sale_status,sales.total_amount,sales.grand_total, sales.rounding_adjustment")
# .joins("INNER JOIN shift_sales sh ON sh.id = sales.shift_sale_id")
# .where("sales.sale_status = 'void' and (sh.shift_started_at between ? and ?
# OR sh.shift_closed_at between ? and ? )", from ,to, from, to)
if shift.present?
query = query.where("sales.sale_status = 'void' and sales.shift_sale_id in (?)",shift.to_a)
else
query = query.where("sales.sale_status = 'void' and sales.receipt_date between ? and ? ",from,to)
end
if status.present? && status == 'cancelled_mmqr'
query = query.joins("INNER JOIN sale_audits sa ON sa.sale_id = sales.sale_id")
.where("sa.action = 'CANCEL_MMQR_PAYMENT'")
elsif status.present? && status == 'void'
query = query.joins("LEFT JOIN sale_audits sa ON sa.sale_id = sales.sale_id AND sa.action = 'CANCEL_MMQR_PAYMENT'")
.where("sa.sale_id IS NULL")
end
out = {:items => query}
sale_arr.push(out)
return sale_arr