update fixed conflicx

2017-11-25 16:51:11 +06:30
parent 2ebecc2fb2 7140df5bf8
commit 74a9166620
17 changed files with 69 additions and 100 deletions
--- a/app/controllers/origami/void_controller.rb
+++ b/app/controllers/origami/void_controller.rb
@@ -8,12 +8,12 @@ class Origami::VoidController < BaseOrigamiController
      sale = Sale.find_by_sale_id(sale_id)
      
      # update count for shift sale
-      if(sale.sale_status == "completed")
+      # 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
+      # end

      sale.payment_status = 'void'
      sale.sale_status = 'void'