update rounding adj

2017-11-30 15:44:48 +06:30
parent a871bf3789
commit 5b9182c1d1
17 changed files with 126 additions and 78 deletions
--- a/app/controllers/origami/master_controller.rb
+++ b/app/controllers/origami/master_controller.rb
@@ -8,6 +8,15 @@ class Origami::MasterController < BaseOrigamiController
    total = sale_data.grand_total
    @mastercount = 0
    others = 0
+    
+    @shop        = Shop::ShopDetail 
+    if @shop.is_rounding_adj
+         new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
+    else
+        new_total    = sale_data.grand_total
+    end
+    @rounding_adj = new_total-sale_data.grand_total  
+
    sale_data.sale_payments.each do |sale_payment|
        if sale_payment.payment_method == "master"
          @mastercount = @mastercount + sale_payment.payment_amount