fixed conflict

2017-06-11 16:58:18 +06:30
parent 05286ce7a6 60b1819220
commit f6d14de461
5 changed files with 50 additions and 30 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -88,7 +88,7 @@ Rails.application.routes.draw do
    # get 'sale/:sale_id/payment/others_payment/:payment_method' => "redeem_payments#index"
    get 'sale/:sale_id/payment/others_payment/MPU' => "mpu#index"
    post 'create_mpu_payment' => "mpu#create"
-    get 'sale/:sale_id/payment/others_payment/REDIMREBATE' => "redeem_payments#index"
+    get 'sale/:sale_id/payment/others_payment/REDEEMREBATE' => "redeem_payments#index"
  end

  #--------- Waiter/Ordering Station ------------#