remove conflict data

app/controllers/origami/sale_edit_controller.rb

@@ -16,8 +16,10 @@ class Origami::SaleEditController < BaseOrigamiController
   # create item void. make duplicate old record and update qty and price
   def item_void
     saleitemId = params[:sale_item_id]
+    remark     = params[:remark]
     saleitemObj = SaleItem.find(saleitemId)
-    saleitemObj.remark = 'void'
+    saleitemObj.status = 'void'
+    saleitemObj.remark = remark
     saleitemObj.save
     @newsaleitem = SaleItem.new
     @newsaleitem = saleitemObj.dup
@@ -27,11 +29,24 @@ class Origami::SaleEditController < BaseOrigamiController
     @newsaleitem.is_taxable = 1
     @newsaleitem.taxable_price = saleitemObj.taxable_price * -1
     @newsaleitem.product_name = saleitemObj.product_name + ' (VOID)'
+    @newsaleitem.remark = remark
     @newsaleitem.save
 
     # re-calc tax
     saleObj = Sale.find(saleitemObj.sale_id)
 
+    
+    booking = Booking.find_by_sale_id(saleitemObj.sale_id)
+    booking.booking_orders.each do |bo|
+      order = Order.find(bo.order_id)
+      order.order_items.each do |o|
+        if saleitemObj.product_code == o.item_code
+          o.qty = saleitemObj.qty * -1
+          o.price = saleitemObj.price * -1
+          o.save
+        end
+      end
+    end
     action_by = current_user.id
     remark = "Void Sale Item ID #{saleitemObj.sale_item_id} | Receipt No #{saleObj.receipt_no} | Item Name ->#{saleitemObj.product_name}-Product Code ->#{saleitemObj.product_code}-Instance Code ->#{saleitemObj.item_instance_code}"
     sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,saleObj.cashier_id, action_by,remark,"SALEITEMVOID" )
@@ -42,8 +57,10 @@ class Origami::SaleEditController < BaseOrigamiController
 
   def item_foc
     saleitemId = params[:sale_item_id]
+    remark     = params[:remark]
     saleitemObj = SaleItem.find(saleitemId)
-    saleitemObj.remark = 'foc'
+    saleitemObj.status = 'foc'
+    saleitemObj.remark = remark
     saleitemObj.save
     @newsaleitem = SaleItem.new
     @newsaleitem = saleitemObj.dup
@@ -53,6 +70,7 @@ class Origami::SaleEditController < BaseOrigamiController
     @newsaleitem.taxable_price = saleitemObj.taxable_price * -1
     @newsaleitem.price = saleitemObj.price * -1
     @newsaleitem.product_name = saleitemObj.product_name + ' (FOC)'
+    @newsaleitem.remark = remark
     @newsaleitem.save
 
     # re-calc tax
@@ -71,7 +89,7 @@ class Origami::SaleEditController < BaseOrigamiController
   #   update_qty = params[:update_qty]
   #   update_price = params[:update_price]
   #   saleitemObj = SaleItem.find(saleitemId)
-  #   saleitemObj.remark = 'void'
+  #   saleitemObj.status = 'void'
   #   saleitemObj.save
   #   @newsaleitem = SaleItem.new
   #   @newsaleitem = saleitemObj.dup
@@ -111,6 +129,18 @@ class Origami::SaleEditController < BaseOrigamiController
 
     # re-calc tax
     saleObj = Sale.find(saleitemObj.sale_id)
+
+    order_id = SaleOrder.find_by_sale_id(saleitemObj.sale_id).order_id
+    order = Order.find(order_id)
+
+    order.order_items.each do |o|
+      if saleitemObj.product_code == o.item_code
+        o.qty = update_qty
+        o.price = update_price
+        o.save
+      end
+    end
+
     saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount)
 
     ProductCommission.edit_product_commission(saleitemObj)
@@ -123,7 +153,7 @@ class Origami::SaleEditController < BaseOrigamiController
     both = SaleItem.where('product_code=?', saleitemObj.product_code)
     both.each do |item|
       if item.qty.to_i > 0
-        item.remark = nil
+        item.status = nil
         item.save
       end
     end
@@ -148,7 +178,7 @@ class Origami::SaleEditController < BaseOrigamiController
       if item.qty.to_i < 0
         item.destroy
       else
-        item.remark = nil
+        item.status = nil
       end
       item.save
       ProductCommission.remove_product_commission(item)