Merge remote-tracking branch 'origin/develop'

We'll only use the master branch for development from now on.

1 files changed, 15 insertions, 18 deletions

diff --git a/engines/billing/config/routes.rb b/engines/billing/config/routes.rb
index 357c55b..12a6778 100644
--- a/engines/billing/config/routes.rb
+++ b/engines/billing/config/routes.rb
@@ -2,26 +2,23 @@ Rails.application.routes.draw do
 
   scope "(:locale)", :locale => CommonLanguages.match_available do
 
-  get 'payments/new' => 'payments#new', :as => :new_payment
-  post 'payments/confirm' => 'payments#confirm', :as => :confirm_payment
-  #  match 'payments/new' => 'payments#new', :as => :new_payment
-  #  match 'payments/confirm' => 'payments#confirm', :as => :confirm_payment
-  #resources :users do
-  # resources :payments, :only => [:new, :confirm]
-  #  resources :subscriptions, :only => [:index, :destroy]
-  #end
-  resources :subscriptions, :only => [:index, :show] do
-    member do
-      post 'subscribe'
-      delete 'unsubscribe'
+    get 'payments/new' => 'payments#new', :as => :new_payment
+    post 'payments/confirm' => 'payments#confirm', :as => :confirm_payment
+    #  match 'payments/new' => 'payments#new', :as => :new_payment
+    #  match 'payments/confirm' => 'payments#confirm', :as => :confirm_payment
+    #resources :users do
+    # resources :payments, :only => [:new, :confirm]
+    #  resources :subscriptions, :only => [:index, :destroy]
+    #end
+    resources :subscriptions, :only => [:index, :show] do
+      member do
+        post 'subscribe'
+        delete 'unsubscribe'
+      end
     end
-  end
-
-  resources :customer, :only => [:new, :edit]
 
-  match 'customer/confirm/' => 'customer#confirm', :as => :confirm_customer
-  match 'customer/show/:id' => 'customer#show', :as => :show_customer
+    resources :customer, :only => [:new, :edit]
 
-  match 'billing_admin' => 'billing_admin#show', :as => :billing_admin
+    get 'billing_admin' => 'billing_admin#show'
   end
 end