From e4b4a3d98695bd1c0c2af8fef424809a0dc0d24f Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 7 Dec 2017 12:19:07 +0630 Subject: [PATCH] rounding adj in credit and other --- app/controllers/origami/credit_payments_controller.rb | 9 +++++++++ app/controllers/origami/jcb_controller.rb | 9 +++++++++ app/controllers/origami/mpu_controller.rb | 9 +++++++++ app/controllers/origami/payments_controller.rb | 5 +++-- app/controllers/origami/visa_controller.rb | 10 ++++++++++ app/models/sale_payment.rb | 2 -- 6 files changed, 40 insertions(+), 4 deletions(-) diff --git a/app/controllers/origami/credit_payments_controller.rb b/app/controllers/origami/credit_payments_controller.rb index f78ea560..986a9467 100755 --- a/app/controllers/origami/credit_payments_controller.rb +++ b/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 diff --git a/app/controllers/origami/jcb_controller.rb b/app/controllers/origami/jcb_controller.rb index 02cf28ea..ffe044f3 100755 --- a/app/controllers/origami/jcb_controller.rb +++ b/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 diff --git a/app/controllers/origami/mpu_controller.rb b/app/controllers/origami/mpu_controller.rb index 3b29599f..3e61a38b 100755 --- a/app/controllers/origami/mpu_controller.rb +++ b/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 diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 7342a4bb..5b0db19f 100755 --- a/app/controllers/origami/payments_controller.rb +++ b/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") diff --git a/app/controllers/origami/visa_controller.rb b/app/controllers/origami/visa_controller.rb index f8dbbfa0..833d8d97 100755 --- a/app/controllers/origami/visa_controller.rb +++ b/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 diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index b71bf733..7fcffd00 100755 --- a/app/models/sale_payment.rb +++ b/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