update edit with remark

app/controllers/origami/discounts_controller.rb

@@ -41,7 +41,7 @@ class Origami::DiscountsController < BaseOrigamiController
           sale_item.product_name = di["name"]
           sale_item.item_instance_code = origin_sale_item.item_instance_code
           sale_item.product_alt_name = ""
-          sale_item.remark = "Discount"
+          sale_item.status = "Discount"
 
           sale_item.qty = -1
           sale_item.unit_price = di["price"].to_f * (-1)
@@ -123,7 +123,7 @@ class Origami::DiscountsController < BaseOrigamiController
       discount_items = []                
       #destroy all discount sale item
       sale.sale_items.each do |si|          
-        if si.remark == "Discount" && si.price < 0                                 
+        if si.status == "Discount" && si.price < 0                                 
           sale.total_amount = (sale.total_amount + si.price.abs) 
           discount_items.push(si)         
         end
@@ -277,7 +277,7 @@ class Origami::DiscountsController < BaseOrigamiController
   #   sale_item.sale_id = sale_id
   #   sale_item.product_code = origin_sale_item != nil ? origin_sale_item.product_code : sale_id
   #   sale_item.product_name = product_name
-  #   sale_item.remark = remark
+  #   sale_item.status = remark
 
   #   sale_item.qty = 1
   #   sale_item.unit_price = (0-discount_amount.to_f)

app/controllers/origami/other_charges_controller.rb

@@ -32,7 +32,7 @@ class Origami::OtherChargesController < BaseOrigamiController
 	          sale_item.product_code = "Other Charges"
 	          sale_item.product_name = "*" + di["name"]
 	          sale_item.product_alt_name = ""
-	          sale_item.remark = "Other Charges"
+	          sale_item.status = "Other Charges"
 
 	          sale_item.qty = 1
 	          sale_item.unit_price = di["price"]

app/controllers/origami/payments_controller.rb

@@ -307,12 +307,14 @@ class Origami::PaymentsController < BaseOrigamiController
 
     if(Sale.exists?(sale_id))
       saleObj      = Sale.find(sale_id)
-         
+       
       if saleObj.discount_type == "member_discount"
         saleObj.update_attributes(rounding_adjustment: 0)
         saleObj.compute_by_sale_items(sale_id, saleObj.sale_items,0)
       end
       
+      saleObj.update_attributes(rounding_adjustment: 0)
+      
       sale_payment = SalePayment.new
       sale_payment.process_payment(saleObj, current_user.name, cash, "foc" ,remark)
 

app/controllers/origami/sale_edit_controller.rb

@@ -10,8 +10,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
@@ -21,6 +23,7 @@ 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
@@ -36,8 +39,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
@@ -47,6 +52,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
@@ -65,7 +71,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
@@ -117,7 +123,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
@@ -142,7 +148,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)