fix shift_sales:audit task
This commit is contained in:
@@ -34,8 +34,14 @@ namespace :shift_sales do
|
|||||||
|
|
||||||
sales = shift_sale.sales.order(:created_at)
|
sales = shift_sale.sales.order(:created_at)
|
||||||
sales.each do |sale|
|
sales.each do |sale|
|
||||||
|
sale_payments = sale.sale_payments.order(:created_at)
|
||||||
|
|
||||||
|
sale.grand_total = sale.total_amount - sale.total_discount
|
||||||
|
|
||||||
|
if sale.tax_type == 'exclusive'
|
||||||
|
sale.grand_total += sale.total_tax
|
||||||
|
end
|
||||||
|
|
||||||
sale.grand_total = sale.total_amount - sale.total_discount + sale.total_tax
|
|
||||||
sale.old_grand_total = grand_total
|
sale.old_grand_total = grand_total
|
||||||
|
|
||||||
if args[:shop_code]
|
if args[:shop_code]
|
||||||
@@ -44,7 +50,7 @@ namespace :shift_sales do
|
|||||||
shop = Shop.first
|
shop = Shop.first
|
||||||
end
|
end
|
||||||
|
|
||||||
if shop.is_rounding_adj
|
if !['foc', 'waste', 'spoile'].include?(sale.payment_status) && (sale.sale_status != 'void' || sale_payments.present?) && shop.is_rounding_adj
|
||||||
new_total = Sale.get_rounding_adjustment(sale.grand_total)
|
new_total = Sale.get_rounding_adjustment(sale.grand_total)
|
||||||
sale.rounding_adjustment = new_total - sale.grand_total
|
sale.rounding_adjustment = new_total - sale.grand_total
|
||||||
sale.old_grand_total = sale.grand_total
|
sale.old_grand_total = sale.grand_total
|
||||||
@@ -53,15 +59,24 @@ namespace :shift_sales do
|
|||||||
sale.rounding_adjustment = 0.00
|
sale.rounding_adjustment = 0.00
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if !['foc', 'waste', 'spoile'].include?(sale.payment_status)
|
||||||
sale.amount_changed = sale.amount_received - sale.grand_total
|
sale.amount_changed = sale.amount_received - sale.grand_total
|
||||||
|
else
|
||||||
|
sale.amount_changed = 0.00
|
||||||
|
end
|
||||||
|
|
||||||
|
sale.update_columns(
|
||||||
|
grand_total: sale.grand_total,
|
||||||
|
old_grand_total: sale.old_grand_total,
|
||||||
|
rounding_adjustment: sale.rounding_adjustment,
|
||||||
|
amount_changed: sale.amount_changed
|
||||||
|
)
|
||||||
|
|
||||||
cash_amount = 0
|
cash_amount = 0
|
||||||
credit_amount = 0
|
credit_amount = 0
|
||||||
other_amount = 0
|
other_amount = 0
|
||||||
|
|
||||||
sale_payments = sale.sale_payments.order(:created_at)
|
|
||||||
sale_payments.each do |sale_payment|
|
sale_payments.each do |sale_payment|
|
||||||
|
|
||||||
if sale_payment.payment_method == 'creditnote'
|
if sale_payment.payment_method == 'creditnote'
|
||||||
credit_amount += sale_payment.payment_amount
|
credit_amount += sale_payment.payment_amount
|
||||||
else
|
else
|
||||||
@@ -90,14 +105,7 @@ namespace :shift_sales do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
sale.update_columns(
|
if sale.sale_status == 'completed'
|
||||||
grand_total: sale.grand_total,
|
|
||||||
old_grand_total: sale.old_grand_total,
|
|
||||||
rounding_adjustment: sale.rounding_adjustment,
|
|
||||||
amount_changed: sale.amount_changed
|
|
||||||
)
|
|
||||||
|
|
||||||
if sale.sale_status != 'void'
|
|
||||||
total_revenue += sale.total_amount
|
total_revenue += sale.total_amount
|
||||||
total_discounts += sale.total_discount
|
total_discounts += sale.total_discount
|
||||||
total_taxes += sale.total_tax
|
total_taxes += sale.total_tax
|
||||||
|
|||||||
Reference in New Issue
Block a user