config/routes.rb in artfully_ose-1.2.0.pre.23 vs config/routes.rb in artfully_ose-1.2.0.pre.24
- old
+ new
@@ -11,11 +11,11 @@
resources :events, :only => :index
end
resources :events, :only => [:index] do
resources :shows, :only => :index
end
- resources :shows, :only => [:index] do
+ resources :shows, :only => [:index, :show] do
resources :orders, :only => :index
end
resources :orders, :only => [:index, :show] do
collection { post :validate }
member { post :validate }
@@ -51,10 +51,11 @@
resources :passes, :only => [:show, :index]
resources :rolling_membership_types, :controller => :membership_types
resources :seasonal_membership_types, :controller => :membership_types
resources :shows, :only => :show
resource :checkout, :only => :create
+ resources :retrievals, :only => [:index, :create]
resource :order, :only => :destroy
get "order", :to => "orders#show"
post "order", :to => "orders#update"
@@ -70,11 +71,11 @@
resource :checkout, :only => :create do
get "dook", :to => "checkouts#dook"
end
end
- devise_for :members, :controllers => { :invitations => "members/invitations", :passwords => "members/passwords" }
+ devise_for :members, :controllers => { :invitations => "members/invitations", :passwords => "members/passwords", :sessions => "members/sessions"}
devise_for :users, :controllers => {:sessions => "users/sessions"}
devise_scope :user do
get "sign_up", :to => "devise/registrations#new"
end
@@ -129,11 +130,18 @@
end
end
def people_actions
resources :actions
- resources :passes, :only => [:index]
+ resources :passes, :only => [:index] do
+ collection do
+ post :bulk_update
+ post :reminder
+ end
+ end
+
+ resources :relationships, :only => :index
resources :memberships do
collection do
post :bulk_update
end
end
@@ -172,10 +180,17 @@
end
resources :companies, :controller => :people do
people_actions
end
+ resources :households do
+ collection do
+ get :suggested
+ put "suggested/:suggested_id" => "households#ignore_suggested", :as => "ignore_suggested"
+ end
+ end
+
def shared_search_segment_routes
resources :actions, :only => [:new, :create]
resources :membership_comps, :only => :new
member do
@@ -257,10 +272,11 @@
resources :ticket_types, :only => [:edit, :update]
resources :orders do
resource :assignment, :only => [ :new, :create ]
collection do
+ get :membership
get :sales
end
member do
get :resend
end
@@ -276,10 +292,11 @@
resources :pass_types
resources :membership_types
resources :rolling_membership_types, :controller => :membership_types
resources :seasonal_membership_types, :controller => :membership_types
resources :membership_comps, :only => :create
+ resources :member_cards, :only => :new
resources :imports do
member do
get :approve
get :recall
@@ -292,9 +309,10 @@
resources :discounts_reports, :only => [:index]
match '/recent_activity' => 'index#recent_activity', :as => :recent_activity
match '/events/:event_id/charts/' => 'events#assign', :as => :assign_chart, :via => "post"
match '/dashboard' => 'index#dashboard', :constraints => lambda{|r| r.env["warden"].authenticate?}
+ match ':organization_slug/whats-my-pass', :controller => 'store/retrievals', :action => 'index'
get ':organization_slug/:controller(/:action(/:id))', controller: /store\/[^\/]+/
match '/:organization_slug' => 'store/events#index', :as => :store_organization_events
root :to => 'index#dashboard'