fixed conflict

config/routes.rb

@@ -1,7 +1,7 @@
 require 'sidekiq/web'
 
 Rails.application.routes.draw do
-  
+
   namespace :settings do
     resources :membership_actions
   end
@@ -94,6 +94,10 @@ Rails.application.routes.draw do
     get '/:customer_id/get_customer' => 'home#get_customer'
     post '/:sale_id/update_sale' , to: "home#update_sale_by_customer"#update customer id in sale table
 
+    # 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/REDEEMREBATE' => "redeem_payments#index"
   end
 
   #--------- Waiter/Ordering Station ------------#