diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb index c0245dc3..9d20ae77 100644 --- a/app/controllers/origami/void_controller.rb +++ b/app/controllers/origami/void_controller.rb @@ -3,6 +3,7 @@ class Origami::VoidController < BaseOrigamiController def overall_void sale_id = params[:sale_id] + if Sale.exists?(sale_id) sale = Sale.find_by_sale_id(sale_id) sale.payment_status = 'void' @@ -10,9 +11,10 @@ class Origami::VoidController < BaseOrigamiController sale.save # update count for shift sale - if(sale.sale_status == "completed") - shift = ShiftSale.current_open_shift(sale.cashier_id) - shift.calculate(sale, "void") + if(sale.sale_status == "void") + # shift = ShiftSale.current_open_shift(sale.cashier_id) + shift = ShiftSale.find(sale.shift_sale_id) + shift.calculate(sale_id, "void") end bookings = sale.bookings