fixed conflict

config/routes.rb

@@ -1,7 +1,10 @@
 require 'sidekiq/web'
 
 Rails.application.routes.draw do
-
+  
+  namespace :settings do
+    resources :membership_actions
+  end
   root 'home#index'
   mount Sidekiq::Web => '/kiq'
 
@@ -74,12 +77,14 @@ Rails.application.routes.draw do
       resources :customers, only: [:index,:new, :create ] #add customer type
     end
 
-
     get "/request_bills/:id" => "request_bills#print"
+    get "/discount/:id" => "discounts#index"
+    post "/discount" => "discounts#create"
 
+    #--------- Payment ------------#
     get 'sale/:sale_id/payment' => 'payments#show'
     post 'payment_process' => 'payments#create'
-
+    post 'paypar_payment_process' => 'paypar_payments#create'
     get 'sale/:sale_id/payment/credit_payment' => "credit_payments#index"
     get 'sale/:sale_id/payment/others_payment' => "others_payments#index"