update void for bitp

2017-08-09 13:57:52 +06:30
parent 3171425aab
commit 13359cecba
1 changed files with 6 additions and 5 deletions
--- a/app/controllers/origami/void_controller.rb
+++ b/app/controllers/origami/void_controller.rb
@@ -6,18 +6,19 @@ class Origami::VoidController < BaseOrigamiController

    if Sale.exists?(sale_id)
      sale = Sale.find_by_sale_id(sale_id)
-      sale.payment_status = 'void'
-      sale.sale_status = 'void'
-      sale.save
-
+      
      # update count for shift sale
-      if(sale.sale_status == "void")
+      if(sale.sale_status == "completed")
        if sale.shift_sale_id != nil
          shift = ShiftSale.find(sale.shift_sale_id)
          shift.calculate(sale_id, "void")
        end
      end

+      sale.payment_status = 'void'
+      sale.sale_status = 'void'
+      sale.save
+
      bookings = sale.bookings
      bookings.each do |booking|
        orders = booking.orders