osaka menu update and void tax calc fix

2017-07-21 14:56:40 +06:30
parent 13e274eefb
commit 2e8c866761
4 changed files with 30 additions and 10 deletions
--- a/app/controllers/origami/void_controller.rb
+++ b/app/controllers/origami/void_controller.rb
@@ -12,9 +12,10 @@ class Origami::VoidController < BaseOrigamiController

      # update count for shift sale
      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")
+        if sale.shift_sale_id != nil
+          shift = ShiftSale.find(sale.shift_sale_id)
+          shift.calculate(sale_id, "void")
+        end
      end

      bookings = sale.bookings