update report and view

2017-07-28 17:07:16 +06:30
parent 24fd399c17
commit 98c04f21d8
14 changed files with 815 additions and 29 deletions
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -166,7 +166,14 @@ class Origami::PaymentsController < BaseOrigamiController
  def rounding_adj

      saleObj      = Sale.find(params[:sale_id])
-      new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
+      @shop        = Shop.find_by_id(1)
+      
+      if @shop.is_rounding_adj
+        new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
+      else
+        new_total    = saleObj.grand_total
+      end
+      
      rounding_adj = new_total-saleObj.grand_total

      saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)