More members overhaul

Relates to #44

members/urls.py

@@ -2,21 +2,21 @@ from django.conf.urls import url
 from django.views.generic.base import RedirectView
 
 # members
-from members.views import member_list
-from members.views import add_member
-from members.views import add_many_members
-from members.views import edit_member
-from members.views import submit_member
-from members.views import update_member
-from members.views import delete_member_confirm
-from members.views import delete_member
-from members.views import list_payments
+from members.views import member_list, payment_add, payment_submit
+from members.views import member_add
+from members.views import member_add_many
+from members.views import member_edit
+from members.views import member_submit
+from members.views import member_update
+from members.views import member_delete_confirm
+from members.views import member_delete
+from members.views import payment_list
 
 #application
-from members.views import application_index
-from members.views import list_applications
-from members.views import edit_application
-from members.views import application_success_index
+from members.views import application_form
+from members.views import application_list
+from members.views import application_edit
+from members.views import application_form_success
 
 favicon_view = RedirectView.as_view(url='static/img/favicon.ico', permanent=True)
 
@@ -27,36 +27,40 @@ urlpatterns = [
         url(r'^list$', member_list),
 
         # add member form view
-        url(r'^add$', add_member),
+        url(r'^add$', member_add),
 
         # add many members view
-        url(r'^add_many$', add_many_members),
+        url(r'^add_many$', member_add_many),
 
         # edit member information view
-        url(r'^edit/(?P<index>\d+)$', edit_member),
+        url(r'^edit/(?P<index>\d+)$', member_edit),
 
         # delete confirmation view
-        url(r'^delete_member_confirm/(?P<index>\d+)$', delete_member_confirm),
+        url(r'^delete_member_confirm/(?P<index>\d+)$', member_delete_confirm),
 
         # list all member applications
-        url(r'^applications$', list_applications),
+        url(r'^applications$', application_list),
 
         # edit member application
-        url(r'^edit_application/(?P<index>\d+)$', edit_application),
+        url(r'^edit_application/(?P<index>\d+)$', application_edit),
 
         # post request targets
-        url(r'^submit_member$', submit_member),
-        url(r'^update_member$', update_member),
-        url(r'^delete_member$', delete_member),
+        url(r'^submit_member$', member_submit),
+        url(r'^update_member$', member_update),
+        url(r'^delete_member$', member_delete),
+        url(r'^submit_payment$', payment_submit),
 
         # the actual member application form
-        url(r'^application/$', application_index),
+        url(r'^application/$', application_form),
 
         # success page for the application
-        url(r'^application/success$', application_success_index),
+        url(r'^application/success$', application_form_success),
 
         # list all payment events
-        url(r'^payments', list_payments),
+        url(r'^payments', payment_list),
+
+        # add payment event
+        url(r'^payment_add', payment_add),
 
         # favourite icon
         url(r'^favicon\.ico$', favicon_view),