Merge 4d4736f042 into 424b1302cb

2016-08-10 06:18:19 +00:00 · 2016-08-10 06:18:19 +00:00 · 211410b6f0
commit 211410b6f0
parent 424b1302cb 4d4736f042
33 changed files with 621 additions and 91 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@ -111,6 +111,7 @@ Osem::Application.routes.draw do
    resource :conference_registration, path: 'register'
    resources :tickets, only: [:index]
    resources :ticket_purchases, only: [:create, :destroy]
+    resources :payments, only: [:index, :new, :create]
    resource :subscriptions, only: [:create, :destroy]

    member do