heck rounding adjustment error

2018-01-28 16:12:59 +06:30
parent d4e2d5be25
commit aa129ad469
9 changed files with 66 additions and 53 deletions
--- a/app/controllers/api/orders_controller.rb
+++ b/app/controllers/api/orders_controller.rb
@@ -184,12 +184,16 @@ class Api::OrdersController <  Api::ApiController
  #checked checkin and checkout time
  def checkin_checkout_time(booking_id)
    status = true
-    today = Time.now.utc
-    booking = Booking.find(params[:booking_id])
-    if !booking.nil?
-      checkout_time = booking.checkout_at.utc
-      if checkout_time <= today
-        status = false
+    if !params[:booking_id].nil?
+      today = Time.now.utc
+      booking = Booking.find(params[:booking_id])
+      if !booking.nil?
+        if !booking.checkout_at.nil?
+          checkout_time = booking.checkout_at.utc
+          if checkout_time <= today
+            status = false
+          end
+        end
      end
    end
    return status
--- a/app/controllers/origami/jcb_controller.rb
+++ b/app/controllers/origami/jcb_controller.rb
@@ -46,13 +46,13 @@ class Origami::JcbController < BaseOrigamiController
      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
+      # 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

-      saleObj = Sale.find(sale_id)
+      # saleObj = Sale.find(sale_id)
      sale_payment = SalePayment.new
      @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "jcb")
    end
--- a/app/controllers/origami/master_controller.rb
+++ b/app/controllers/origami/master_controller.rb
@@ -45,13 +45,13 @@ class Origami::MasterController < BaseOrigamiController
      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
+      # 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

-      saleObj = Sale.find(sale_id)
+      # saleObj = Sale.find(sale_id)
      sale_payment = SalePayment.new
      @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "master")
    end
--- a/app/controllers/origami/mpu_controller.rb
+++ b/app/controllers/origami/mpu_controller.rb
@@ -45,13 +45,13 @@ class Origami::MpuController < BaseOrigamiController
      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
+      # 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

-      saleObj = Sale.find(sale_id)
+      # saleObj = Sale.find(sale_id)
      sale_payment = SalePayment.new
      @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "mpu")
    end
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -28,7 +28,6 @@ class Origami::PaymentsController < BaseOrigamiController
      shop_details =  Shop::ShopDetail 
      # customer= Customer.where('customer_id=' +.customer_id)
      customer = Customer.find(sale_data.customer_id)
-
      # rounding adjustment
        if shop_details.is_rounding_adj
          a = sale_data.grand_total % 25 # Modulus
@@ -42,7 +41,6 @@ class Origami::PaymentsController < BaseOrigamiController
          end
        end
        #end rounding adjustment
-
      # get member information
      rebate = MembershipSetting.find_by_rebate(1)
      if customer.membership_id != nil && rebate
@@ -74,7 +72,6 @@ class Origami::PaymentsController < BaseOrigamiController
    if(Sale.exists?(sale_id))
      saleObj = Sale.find(sale_id)
      shop_details =  Shop::ShopDetail 
-      
      # rounding adjustment
      if shop_details.is_rounding_adj
        a = saleObj.grand_total % 25 # Modulus
@@ -167,12 +164,7 @@ class Origami::PaymentsController < BaseOrigamiController
      @table_no = ''

      @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
+      @rounding_adj = @sale_data.rounding_adjustment

      #get customer amount
      @customer = Customer.find(@sale_data.customer_id)
--- a/app/controllers/origami/redeem_payments_controller.rb
+++ b/app/controllers/origami/redeem_payments_controller.rb
@@ -6,12 +6,13 @@ class Origami::RedeemPaymentsController < BaseOrigamiController
 		sale_data = Sale.find_by_sale_id(@sale_id)

        @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  
+        # 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  
+        @rounding_adj = sale_data.rounding_adjustment  

        @payparcount = 0
        others = 0
--- a/app/controllers/origami/unionpay_controller.rb
+++ b/app/controllers/origami/unionpay_controller.rb
@@ -46,13 +46,13 @@ class Origami::UnionpayController < BaseOrigamiController
      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
+      # 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
      
-      saleObj = Sale.find(sale_id)
+      # saleObj = Sale.find(sale_id)
      #end rounding adjustment
      sale_payment = SalePayment.new
      @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "unionpay")
--- a/app/controllers/origami/visa_controller.rb
+++ b/app/controllers/origami/visa_controller.rb
@@ -44,13 +44,13 @@ class Origami::VisaController < BaseOrigamiController
      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
+      # 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
      
-      saleObj = Sale.find(sale_id)
+      # saleObj = Sale.find(sale_id)
      #end rounding adjustment
      sale_payment = SalePayment.new
      @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "visa")
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -470,8 +470,24 @@ class Sale < ApplicationRecord
  end

  def adjust_rounding
-    self.grand_total
-    self.rounding_adjustment = 0.00
+    saleObj = Sale.find(self.sale_id)
+    shop_details =  Shop::ShopDetail 
+      # rounding adjustment
+    if shop_details.is_rounding_adj
+      a = saleObj.grand_total % 25 # Modulus
+      b = saleObj.grand_total / 25 # Division
+      #not calculate rounding if modulus is 0 and division is even
+      #calculate rounding if modulus is zero or not zero and division are not even
+      if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0)
+        new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
+        self.rounding_adjustment = new_total-saleObj.grand_total
+      else
+        self.rounding_adjustment = 0.00
+      end
+    else
+      self.rounding_adjustment = 0.00
+    end
+    
  end

  #Generate new Receipt No when it is not assigned