diff options
author | jessib <jessib@riseup.net> | 2013-09-19 12:07:25 -0700 |
---|---|---|
committer | jessib <jessib@riseup.net> | 2013-09-19 12:07:25 -0700 |
commit | 3a2e64c75f67af89ffd78dbf80dd947896d85d22 (patch) | |
tree | ea17ee32d763bb875e4814b09ed1f443c112980c /billing/config | |
parent | e8a2db42813dc3f5d1ebb95eb896455d7a922505 (diff) | |
parent | 890c9e170fc038eccb46eca3c1ddcf6f05eaa53f (diff) |
Merge branch 'develop' into feature/only_lower_case_aliases
Diffstat (limited to 'billing/config')
-rw-r--r-- | billing/config/routes.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/billing/config/routes.rb b/billing/config/routes.rb index 8b7b5bf..e024f43 100644 --- a/billing/config/routes.rb +++ b/billing/config/routes.rb @@ -4,7 +4,7 @@ Rails.application.routes.draw do match 'payments/confirm' => 'payments#confirm', :as => :confirm_payment resources :users do resources :payments, :only => [:index] - resources :subscriptions, :only => [:index, :show] + resources :subscriptions, :only => [:index, :show, :destroy] end resources :customer, :only => [:new, :edit] @@ -14,7 +14,7 @@ Rails.application.routes.draw do match 'customer/show/:id' => 'customer#show', :as => :show_customer match 'credit_card_info/confirm' => 'credit_card_info#confirm', :as => :confirm_credit_card_info - resources :subscriptions, :only => [:new, :create, :update, :destroy] # index and show are within users path + resources :subscriptions, :only => [:new, :create, :update] # index, show & destroy are within users path #match 'transactions/:product_id/new' => 'transactions#new', :as => :new_transaction #match 'transactions/confirm/:product_id' => 'transactions#confirm', :as => :confirm_transaction |