diff --git a/app/controllers/origami/redeem_payments_controller.rb b/app/controllers/origami/redeem_payments_controller.rb
index 792cb7a4..802ba51b 100644
--- a/app/controllers/origami/redeem_payments_controller.rb
+++ b/app/controllers/origami/redeem_payments_controller.rb
@@ -6,8 +6,24 @@ class Origami::RedeemPaymentsController < BaseOrigamiController
  		sale_data = Sale.find_by_sale_id(@sale_id)
 
     # limit redeem_amount
-    rebate_prices = SaleItem.calculate_food_beverage(sale_data.sale_items)
-    nonrebate_prices = sale_data.total_amount - rebate_prices
+    # rebate_prices = SaleItem.calculate_food_beverage(sale_data.sale_items)
+    # nonrebate_prices = sale_data.total_amount - rebate_prices
+    # @payparcount = 0
+    # others = 0
+    # sale_data.sale_payments.each do |sale_payment|
+    #     if sale_payment.payment_method == "paypar"
+    #       @payparcount = @payparcount + sale_payment.payment_amount
+    #     else
+    #       others = others + sale_payment.payment_amount
+    #     end
+    # end
+    # non_rebate_exceed = others - (nonrebate_prices +  sale_data.total_tax)
+    # if non_rebate_exceed < 0
+    #   @redeem_prices = rebate_prices - @payparcount
+    # else
+    #   @redeem_prices = rebate_prices - @payparcount -non_rebate_exceed
+    # end
+
     @payparcount = 0
     others = 0
     sale_data.sale_payments.each do |sale_payment|
@@ -17,12 +33,8 @@ class Origami::RedeemPaymentsController < BaseOrigamiController
           others = others + sale_payment.payment_amount
         end
     end
-    non_rebate_exceed = others - (nonrebate_prices +  sale_data.total_tax)
-    if non_rebate_exceed < 0
-      @redeem_prices = rebate_prices - @payparcount
-    else
-      @redeem_prices = rebate_prices - @payparcount -non_rebate_exceed
-    end
+    @redeem_prices = sale_data.grand_total - @payparcount -others
+
 
  		if sale_data
  			if sale_data.customer_id