From 832f5d29c9baa1e7b2a1d05ca9661afe3c974b3d Mon Sep 17 00:00:00 2001 From: Thein Lin Kyaw Date: Thu, 9 Jul 2020 15:37:26 +0630 Subject: [PATCH] fix shift_sale member_discount void --- app/controllers/origami/void_controller.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb index f0b7dfc7..cea64868 100755 --- a/app/controllers/origami/void_controller.rb +++ b/app/controllers/origami/void_controller.rb @@ -9,11 +9,6 @@ class Origami::VoidController < BaseOrigamiController if Sale.exists?(sale_id) sale = Sale.find_by_sale_id(sale_id) - if sale.discount_type == "member_discount" - sale.update_attributes(total_discount: 0) - sale.compute_by_sale_items(0, nil, order_source) - end - # update count for shift sale if(sale.sale_status == "completed") if sale.shift_sale_id != nil @@ -29,6 +24,11 @@ class Origami::VoidController < BaseOrigamiController end end + if sale.discount_type == "member_discount" + sale.update_attributes(total_discount: 0) + sale.compute_by_sale_items(0, nil, order_source) + end + sale.rounding_adjustment = 0.0 sale.payment_status = 'void' sale.sale_status = 'void'