rounding adj in credit and other

app/controllers/origami/credit_payments_controller.rb

@@ -31,6 +31,15 @@ class Origami::CreditPaymentsController < BaseOrigamiController
     sale_id = params[:sale_id]
     if(Sale.exists?(sale_id))
       saleObj = Sale.find(sale_id)
+      shop_details =  Shop::ShopDetail 
+      
+      # rounding adjustment
+      if shop_details.is_rounding_adj
+        new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
+        rounding_adj = new_total-saleObj.grand_total
+        saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)        
+      end
+      
       sale_payment = SalePayment.new
       @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "creditnote")
     end

app/controllers/origami/jcb_controller.rb

@@ -36,6 +36,15 @@ class Origami::JcbController < BaseOrigamiController
     sale_id = params[:sale_id]
     if(Sale.exists?(sale_id))
       saleObj = Sale.find(sale_id)
+      shop_details =  Shop::ShopDetail 
+      
+      # rounding adjustment
+      if shop_details.is_rounding_adj
+        new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
+        rounding_adj = new_total-saleObj.grand_total
+        saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)        
+      end
+      
       sale_payment = SalePayment.new
       @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "jcb")
     end

app/controllers/origami/mpu_controller.rb

@@ -35,6 +35,15 @@ class Origami::MpuController < BaseOrigamiController
     sale_id = params[:sale_id]
     if(Sale.exists?(sale_id))
       saleObj = Sale.find(sale_id)
+      shop_details =  Shop::ShopDetail 
+      
+      # rounding adjustment
+      if shop_details.is_rounding_adj
+        new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
+        rounding_adj = new_total-saleObj.grand_total
+        saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)        
+      end
+      
       sale_payment = SalePayment.new
       @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "mpu")
     end

app/controllers/origami/payments_controller.rb

@@ -56,12 +56,13 @@ class Origami::PaymentsController < BaseOrigamiController
       saleObj = Sale.find(sale_id)
       shop_details =  Shop::ShopDetail 
       
+      # rounding adjustment
       if shop_details.is_rounding_adj
         new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
         rounding_adj = new_total-saleObj.grand_total
-        saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)
-        #end rounding adjment
+        saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)        
       end
+      #end rounding adjustment
 
       sale_payment = SalePayment.new
       sale_payment.process_payment(saleObj, @user, cash, "cash")

app/controllers/origami/visa_controller.rb

@@ -34,6 +34,16 @@ class Origami::VisaController < BaseOrigamiController
     sale_id = params[:sale_id]
     if(Sale.exists?(sale_id))
       saleObj = Sale.find(sale_id)
+      shop_details =  Shop::ShopDetail 
+      
+      # rounding adjustment
+      if shop_details.is_rounding_adj
+        new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
+        rounding_adj = new_total-saleObj.grand_total
+        saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)        
+      end
+      
+      #end rounding adjustment
       sale_payment = SalePayment.new
       @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "visa")
     end

app/models/sale_payment.rb

@@ -213,14 +213,12 @@ class SalePayment < ApplicationRecord
 
   def external_terminal_card_payment(method)
     payment_status = false
-
     self.payment_method = method
     self.payment_amount = self.received_amount
     self.payment_reference  = self.card_payment_reference
     self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f
     self.payment_status = "paid"
     payment_method = self.save!
-
     sale_update_payment_status(self.received_amount)
     return payment_status
   end