Resolve merge conflicts in payout system implementation
Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
This commit is contained in:
@@ -1,12 +1,4 @@
|
||||
Rails.application.routes.draw do
|
||||
namespace :admin do
|
||||
resources :payouts, only: [ :index, :show ] do
|
||||
member do
|
||||
post :process
|
||||
post :mark_as_manually_processed
|
||||
end
|
||||
end
|
||||
end
|
||||
# Define your application routes per the DSL in https://guides.rubyonrails.org/routing.html
|
||||
|
||||
# Reveal health status on /up that returns 200 if the app boots with no exceptions, otherwise 500.
|
||||
@@ -103,6 +95,21 @@ Rails.application.routes.draw do
|
||||
end
|
||||
end
|
||||
|
||||
# === Administration ===
|
||||
namespace :admin do
|
||||
resources :payouts, only: [ :index, :show ] do
|
||||
member do
|
||||
post :approve
|
||||
post :reject
|
||||
post :mark_processing
|
||||
post :mark_completed
|
||||
post :mark_failed
|
||||
post :process
|
||||
post :mark_as_manually_processed
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
# API routes versioning
|
||||
namespace :api do
|
||||
namespace :v1 do
|
||||
|
||||
Reference in New Issue
Block a user