osaka menu update and void tax calc fix

app/controllers/origami/sale_edit_controller.rb

@@ -21,6 +21,10 @@ class Origami::SaleEditController < BaseOrigamiController
      @newsaleitem.is_taxable = 1
      @newsaleitem.product_name = saleitemObj.product_name + " - void"
      @newsaleitem.save
+
+     # re-calc tax
+     saleObj =  Sale.find(saleitemObj.sale_id)
+     saleObj.compute_without_void
    end
 
   # def item_edit
@@ -56,6 +60,10 @@ class Origami::SaleEditController < BaseOrigamiController
     # saleitemObj.remark        = 'edit'
     saleitemObj.product_name  = saleitemObj.product_name + " - updated"
     saleitemObj.save
+
+     # re-calc tax
+     saleObj =  Sale.find(saleitemObj.sale_id)
+     saleObj.compute_without_void
   end
 
 
@@ -71,6 +79,10 @@ class Origami::SaleEditController < BaseOrigamiController
        end
      end
      saleitemObj.destroy
+
+      # re-calc tax
+     saleObj =  Sale.find(saleitemObj.sale_id)
+     saleObj.compute_without_void
    end
 
    # remove all void items
@@ -85,6 +97,9 @@ class Origami::SaleEditController < BaseOrigamiController
        end
        item.save
      end
+
+      # re-calc tax
+     saleObj.compute_without_void
    end
 
    def apply_void

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