Merge branch 'master' into settings_backend

app/controllers/origami/home_controller.rb

@@ -23,7 +23,7 @@ class Origami::HomeController < BaseOrigamiController
            @order_items = Array.new
            booking.booking_orders.each do |booking_order|
               order = Order.find(booking_order.order_id)
-              if (order.status == "new")                
+              if (order.status == "new")
                 @obj_order = order
                 @customer = order.customer
                 @date = order.created_at

app/controllers/origami/sale_edit_controller.rb

@@ -5,4 +5,18 @@ class Origami::SaleEditController < BaseOrigamiController
      @table_id = params[:table_id]
      @saleobj = Sale.find(sale_id)
    end
+
+   def item_void
+     saleitemId = params[:sale_item_id]
+     saleitemObj = SaleItem.find(saleitemId)
+     saleitemObj.remark = 'void'
+     saleitemObj.save
+     @newsaleitem = SaleItem.new
+     @newsaleitem = saleitemObj.dup
+     @newsaleitem.save
+     @newsaleitem.qty = saleitemObj.qty * -1
+     @newsaleitem.price = saleitemObj.price * -1
+     @newsaleitem.product_name = saleitemObj.product_name + " - void"
+     @newsaleitem.save
+   end
 end