-
-
-
- For yderligere hjælp med at bruge denne side - se på
- "Sådan bruger du vores
- medlemssystem" eller skriv til os på
- kontakt@codingpirates.dk.
-
-
+
+ For yderligere hjælp med at bruge denne side - se på
+ "Sådan bruger du vores
+ medlemssystem" eller skriv til os på
+ kontakt@codingpirates.dk.
+
{% else %}
Tilmelding til Coding Pirates
diff --git a/members/templates/members/family_details.html b/members/templates/members/family_details.html
index 2c764e78..71c558c0 100644
--- a/members/templates/members/family_details.html
+++ b/members/templates/members/family_details.html
@@ -32,7 +32,7 @@
Personer
-
+
{% if family.person_set.count > 0 %}
diff --git a/members/templates/members/header.html b/members/templates/members/header.html
index 4f5981ea..8fec5ecb 100644
--- a/members/templates/members/header.html
+++ b/members/templates/members/header.html
@@ -8,6 +8,8 @@
Familie
Afdelinger
Arrangementer
+ Medlemskaber
+ Betalinger
Log ud
{% else %}
Tilmeld barn
diff --git a/members/templates/members/memberships.html b/members/templates/members/memberships.html
new file mode 100644
index 00000000..d8c080d0
--- /dev/null
+++ b/members/templates/members/memberships.html
@@ -0,0 +1,49 @@
+{% extends 'members/base.html' %} {% load static %}
+{% block content %}
+
+Medlemskaber
+
+ Coding Pirates består af {{ unions | length}} foreninger. Hver forening har
+ sin egen bestyrelse. For at blive medlem at en forening skal man betale
+ kontingent, hver forening sætter sin egen kontingent. Det er et krav at være
+ medlem for at være stemmeberetiget til en generalforsamling.
+ Nogle aktiviteter i Coding Pirates, f.eks klubaftner, har prisen på
+ medlemsskab indregnet.
+
+
+ På denne side kan du se dine medlemsskaber og melde dig ind i foreninger.
+
+
+
+
+{% if current_memberships %}
+
+ Mine medlemsskaber
+
+
+ | Navn |
+ Forening |
+ År |
+
+
+ {% for membership in current_memberships %}
+
+ | {{membership.person}} |
+ {{membership.union}} |
+ {{membership.sign_up_date.year}} |
+
+ {% endfor %}
+
+
+
+{% endif %}
+{% endblock %}
diff --git a/members/templates/members/payments.html b/members/templates/members/payments.html
new file mode 100644
index 00000000..130a4d8c
--- /dev/null
+++ b/members/templates/members/payments.html
@@ -0,0 +1,38 @@
+{% extends 'members/base.html' %} {% load static %}
+{% block content %}
+
+Betalinger
+
+ På denne side kan du se et oversigt over dine betalinger, hvis en betaling
+ mangler er den markeret med rød.
+
+
+
+ | Dato |
+ Købt |
+ Beløb |
+ Status |
+
+
+ {% for payment in payments %}
+
+ | {{payment.added |date:'d-m-Y '}} |
+ {{payment.get_item}} |
+ {{payment.show_amount}} kr |
+
+ {% if payment.get_status == "accepted" %}
+ Betalt
+ {% else %}
+
+ Ikke betalt
+
+ {% endif %}
+ |
+
+ {% endfor %}
+
+
+
+
+
+{% endblock %}
diff --git a/members/tests/factories/__init__.py b/members/tests/factories/__init__.py
index a35602eb..7a6162e1 100644
--- a/members/tests/factories/__init__.py
+++ b/members/tests/factories/__init__.py
@@ -9,8 +9,11 @@
from .activity_participant_factory import ActivityParticipantFactory
from .payment_factory import PaymentFactory
from .volunteer_factory import VolunteerFactory
+from .membership_factory import MembershipFactory
+from .payable_item_factory import PayableItemFactory
__all__ = [
+ PayableItemFactory,
ActivityParticipantFactory,
PaymentFactory,
AddressFactory,
@@ -22,4 +25,5 @@
ActivityFactory,
MemberFactory,
VolunteerFactory,
+ MembershipFactory,
]
diff --git a/members/tests/factories/membership_factory.py b/members/tests/factories/membership_factory.py
new file mode 100644
index 00000000..7ec7b3f6
--- /dev/null
+++ b/members/tests/factories/membership_factory.py
@@ -0,0 +1,13 @@
+from factory import DjangoModelFactory, SubFactory
+from members.models import Membership
+
+from members.tests.factories.union_factory import UnionFactory
+from members.tests.factories.person_factory import PersonFactory
+
+
+class MembershipFactory(DjangoModelFactory):
+ class Meta:
+ model = Membership
+
+ union = SubFactory(UnionFactory)
+ person = SubFactory(PersonFactory)
diff --git a/members/tests/factories/payable_item_factory.py b/members/tests/factories/payable_item_factory.py
new file mode 100644
index 00000000..d8f47611
--- /dev/null
+++ b/members/tests/factories/payable_item_factory.py
@@ -0,0 +1,15 @@
+from factory import DjangoModelFactory, SubFactory
+from members.models import PayableItem
+from factory.fuzzy import FuzzyInteger
+
+from members.tests.factories.membership_factory import MembershipFactory
+from members.tests.factories.person_factory import PersonFactory
+
+
+class PayableItemFactory(DjangoModelFactory):
+ class Meta:
+ model = PayableItem
+
+ person = SubFactory(PersonFactory)
+ amount_ore = FuzzyInteger(7500, 200000)
+ membership = SubFactory(MembershipFactory)
diff --git a/members/tests/test_functional/test_admin_can_load.py b/members/tests/test_functional/test_admin_can_load.py
index 54e72f67..3c5592bd 100644
--- a/members/tests/test_functional/test_admin_can_load.py
+++ b/members/tests/test_functional/test_admin_can_load.py
@@ -1,13 +1,16 @@
-import socket
import os
-from django.contrib.staticfiles.testing import StaticLiveServerTestCase
+import socket
+
from selenium import webdriver
from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
-from selenium.webdriver.support.ui import WebDriverWait
from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import WebDriverWait
+
from django.contrib.auth.models import User
+from django.contrib.staticfiles.testing import StaticLiveServerTestCase
from members.tests.factories import PersonFactory
+
"""
This test creates a super user and checks that the admin interface can be loaded
"""
diff --git a/members/tests/test_functional/test_create_family.py b/members/tests/test_functional/test_create_family.py
index 144efdf1..1505a34a 100644
--- a/members/tests/test_functional/test_create_family.py
+++ b/members/tests/test_functional/test_create_family.py
@@ -1,11 +1,14 @@
-import socket
import os
-from django.contrib.staticfiles.testing import StaticLiveServerTestCase
+import socket
+
from selenium import webdriver
-from selenium.webdriver.support.ui import WebDriverWait
from selenium.webdriver.common.by import By
-from selenium.webdriver.support import expected_conditions as EC
from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import WebDriverWait
+
+from django.contrib.staticfiles.testing import StaticLiveServerTestCase
+
"""
This test goes to the root signup page and creates a child and parent.
diff --git a/members/tests/test_functional/test_create_membership_fail.py b/members/tests/test_functional/test_create_membership_fail.py
new file mode 100644
index 00000000..d679287b
--- /dev/null
+++ b/members/tests/test_functional/test_create_membership_fail.py
@@ -0,0 +1,87 @@
+import os
+import socket
+from datetime import date
+
+from selenium import webdriver
+from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import WebDriverWait
+
+from django.contrib.staticfiles.testing import StaticLiveServerTestCase
+from members.models import Membership
+from members.tests.factories import FamilyFactory, PersonFactory, UnionFactory
+
+from .functional_helpers import get_text_contains, log_in
+
+
+"""
+This test starts with a family with a child that is a member and the parent
+wants to become a member.
+
+The parent ques to quickpay and leaves the page without entering card details.
+Once they go back to our page it is marked at not payed.
+"""
+
+
+class SignUpTest(StaticLiveServerTestCase):
+ host = socket.gethostbyname(socket.gethostname())
+
+ def setUp(self):
+ self.email = "parent@example.com"
+ self.browser = webdriver.Remote(
+ "http://selenium:4444/wd/hub", DesiredCapabilities.CHROME
+ )
+ self.family = FamilyFactory()
+ self.person = PersonFactory.create(family=self.family)
+ self.kid = PersonFactory.create(family=self.family, membertype="CH")
+ self.union = UnionFactory.create()
+ Membership.objects.create(
+ union=self.union, person=self.kid, sign_up_date=date.today()
+ )
+
+ def tearDown(self):
+ if not os.path.exists("test-screens"):
+ os.mkdir("test-screens")
+ self.browser.save_screenshot("test-screens/membership_test_final_not_payed.png")
+ self.browser.quit()
+
+ def test_entry_page(self):
+ log_in(self, self.person)
+
+ get_text_contains(self.browser, "få medlemsskab")[0].click()
+ # Check row in membership table has kid's name in it
+
+ self.browser.find_element_by_name("person").click()
+
+ # Click on option in select that has parent name
+ self.browser.find_element_by_xpath(
+ f"//*[@id='id_person']/option[text()[contains(., '{self.person}')]]"
+ ).click()
+
+ # Click on select Union
+ self.browser.find_element_by_name("union").click()
+ self.browser.find_element_by_xpath(
+ f"//*[@id='id_union']/option[text()[contains(., '{self.union}')]]"
+ ).click()
+
+ # Gå til betaling
+ self.browser.find_element_by_xpath("//input[@type='submit']").click()
+
+ # Leave quickpay and go back to entry page
+ self.browser.get(f"{self.live_server_url}")
+
+ try: # Wait to be redirected back from quickpay, worst case i 5 mins
+ WebDriverWait(self.browser, 60 * 5).until(
+ EC.title_is("Coding Pirates Medlemssystem")
+ )
+ except Exception:
+ self.fail("Was not sent back to own page")
+
+ # Go to paymetns views
+ get_text_contains(self.browser, "Se dine betalinger")[0].click()
+
+ # Klick "ikke betalt" button
+ self.browser.find_element_by_class_name("button-danger").click()
+
+ # Back at quickpay
+ self.assertIn("https://payment.quickpay.net", self.browser.current_url)
diff --git a/members/tests/test_functional/test_create_membership_success.py b/members/tests/test_functional/test_create_membership_success.py
new file mode 100644
index 00000000..03e2b232
--- /dev/null
+++ b/members/tests/test_functional/test_create_membership_success.py
@@ -0,0 +1,142 @@
+import os
+import socket
+from datetime import date
+import time
+from selenium import webdriver
+from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.common.keys import Keys
+from django.contrib.staticfiles.testing import StaticLiveServerTestCase
+from django.core import mail
+from members.models import Membership, PayableItem
+from members.tests.factories import FamilyFactory, PersonFactory, UnionFactory
+
+from .functional_helpers import get_text_contains, log_in
+
+
+"""
+This test starts with a family with a child that is a member and the parent
+wants to become a member.
+
+The parent ques to quickpay and enters a valid card, is sent to the payments
+screen. And recvies an email confirmation.
+"""
+
+
+class SignUpTest(StaticLiveServerTestCase):
+ host = socket.gethostbyname(socket.gethostname())
+
+ def setUp(self):
+ self.email = "parent@example.com"
+ self.browser = webdriver.Remote(
+ "http://selenium:4444/wd/hub", DesiredCapabilities.CHROME
+ )
+ self.family = FamilyFactory()
+ self.person = PersonFactory.create(family=self.family)
+ self.kid = PersonFactory.create(family=self.family, membertype="CH")
+ self.union = UnionFactory.create()
+ Membership.objects.create(
+ union=self.union, person=self.kid, sign_up_date=date.today()
+ )
+
+ def tearDown(self):
+ if not os.path.exists("test-screens"):
+ os.mkdir("test-screens")
+ self.browser.save_screenshot("test-screens/membership_test_final.png")
+ self.browser.quit()
+
+ def test_entry_page(self):
+ log_in(self, self.person)
+
+ get_text_contains(self.browser, "få medlemsskab")[0].click()
+ # Check row in membership table has kid's name in it
+ self.assertEqual(self.browser.find_element_by_xpath("//td").text, str(self.kid))
+ self.assertGreater(
+ len(get_text_contains(self.browser, "Mine medlemsskaber")), 0
+ )
+
+ # Click on select person
+ self.browser.find_element_by_name("person").click()
+
+ # Click on option in select that has parent name
+ self.browser.find_element_by_xpath(
+ f"//*[@id='id_person']/option[text()[contains(., '{self.person}')]]"
+ ).click()
+
+ # Click on select Union
+ self.browser.find_element_by_name("union").click()
+ self.browser.find_element_by_xpath(
+ f"//*[@id='id_union']/option[text()[contains(., '{self.union}')]]"
+ ).click()
+
+ # Gå til betaling
+ self.browser.find_element_by_xpath("//input[@type='submit']").click()
+
+ try: # Wait to be redirected to quickpay, worst case i 5 mins
+ WebDriverWait(self.browser, 60).until(
+ EC.title_is("Coding Pirates Test Account")
+ )
+ except Exception:
+ self.fail("Was not sent to quickpay")
+
+ # Enter card number
+ card_field = self.browser.find_element_by_id("cardnumber")
+ card_field.send_keys(Keys.NUMPAD1)
+ card_field.send_keys(Keys.NUMPAD0)
+ card_field.send_keys(Keys.NUMPAD0)
+ card_field.send_keys(Keys.NUMPAD0)
+
+ card_field.send_keys(Keys.NUMPAD0)
+ card_field.send_keys(Keys.NUMPAD6)
+ card_field.send_keys(Keys.NUMPAD0)
+ card_field.send_keys(Keys.NUMPAD0)
+
+ card_field.send_keys(Keys.NUMPAD0)
+ card_field.send_keys(Keys.NUMPAD0)
+ card_field.send_keys(Keys.NUMPAD0)
+ card_field.send_keys(Keys.NUMPAD0)
+
+ card_field.send_keys(Keys.NUMPAD0)
+ card_field.send_keys(Keys.NUMPAD0)
+ card_field.send_keys(Keys.NUMPAD0)
+ card_field.send_keys(Keys.NUMPAD2)
+ # self.browser.find_element_by_id("cardnumber").send_keys("1000 0600 0000 0002")
+ time.sleep(1)
+
+ # Enter experation month
+ self.browser.find_element_by_id("expiration-month").send_keys("11")
+
+ # Enter experation year
+ self.browser.find_element_by_id("expiration-year").send_keys("30")
+
+ # Enter CVS
+ self.browser.find_element_by_id("cvd").send_keys("208")
+ self.browser.find_element_by_id("cvd").send_keys(Keys.TAB)
+
+ self.browser.save_screenshot("test-screens/membership_test_card_details.png")
+
+ # Finish payment
+ self.browser.find_element_by_xpath("//*[@type='submit']").click()
+
+ try: # Wait to be redirected back from quickpay, worst case i 5 mins
+ WebDriverWait(self.browser, 60).until(
+ EC.title_is("Coding Pirates Medlemssystem")
+ )
+ except Exception:
+ self.fail("Was not sent back to own page")
+
+ payment_statuses = self.browser.find_elements_by_xpath(
+ '//*/td[@data-label="Status"]'
+ )
+ for status in payment_statuses:
+ self.assertEqual(status.text.strip(), "Betalt")
+
+ # Sent one confirmation email
+ self.assertEqual(PayableItem.send_all_payment_confirmations(), [1])
+
+ # Check that we can't send it again
+ self.assertEqual(PayableItem.send_all_payment_confirmations(), [])
+
+ # Sent to right person
+ self.assertEqual(mail.outbox[0].to, [self.person.email])
diff --git a/members/tests/test_model_activityparticipant.py b/members/tests/test_model_activityparticipant.py
index 338b4acb..f70bb4b3 100644
--- a/members/tests/test_model_activityparticipant.py
+++ b/members/tests/test_model_activityparticipant.py
@@ -20,6 +20,7 @@ def setUp(self):
end_date=datetime.now()
+ timedelta(days=365), # Has to be long enough to be a season
department=self.department,
+ union=self.department.union,
)
self.activity.save()
self.assertTrue(self.activity.is_season()) # If this fail increase the end_date
diff --git a/members/tests/test_model_membership.py b/members/tests/test_model_membership.py
new file mode 100644
index 00000000..3d64364e
--- /dev/null
+++ b/members/tests/test_model_membership.py
@@ -0,0 +1,19 @@
+from django.test import TestCase
+from django.core.exceptions import ValidationError
+from members.models import Membership
+from .factories import UnionFactory, PersonFactory
+from datetime import date
+
+
+class TestModelMembership(TestCase):
+ def test_create_membership_same_year(self):
+ # Creates two memberships in the same year.
+ person = PersonFactory.create()
+ union = UnionFactory.create()
+ Membership.objects.create(
+ person=person, union=union, sign_up_date=date(2020, 3, 14)
+ )
+ with self.assertRaises(ValidationError):
+ Membership.objects.create(
+ person=person, union=union, sign_up_date=date(2020, 5, 14)
+ )
diff --git a/members/tests/test_model_payable_item.py b/members/tests/test_model_payable_item.py
new file mode 100644
index 00000000..5dc1c476
--- /dev/null
+++ b/members/tests/test_model_payable_item.py
@@ -0,0 +1,84 @@
+from django.core.exceptions import ValidationError
+from requests.exceptions import HTTPError
+
+from django.test import TestCase
+from members.models import PayableItem
+from members.models.payable_item import _set_quickpay_order_id
+from .factories import PersonFactory, PayableItemFactory
+
+
+class TestPayableItem(TestCase):
+ def test_set_quickpay_order_id(self):
+ # Tests that the quickpay order id is set to something uniqe in dev/test
+ # and count in prod
+ p1 = PayableItemFactory.create()
+ with self.settings(PAYMENT_ID_PREFIX="prod"):
+ id1 = _set_quickpay_order_id()
+ p2 = PayableItemFactory.create()
+ with self.settings(PAYMENT_ID_PREFIX="prod"):
+ id2 = _set_quickpay_order_id()
+
+ self.assertLess(p1.quick_pay_order_id, p2.quick_pay_order_id)
+ self.assertLess(id1, id2)
+
+ def test_get_cant_create_empty(self):
+ # Tests that either membership, activty or season is passed
+ person = PersonFactory.create()
+ with self.assertRaises(ValidationError):
+ PayableItem.objects.create(person=person, amount_ore=7500)
+
+ def test_try_to_change_quickpay_id(self):
+ # Creates a payment item and tries to change the ID which should fail
+ payment = PayableItemFactory.create()
+ payment.quick_pay_id = "something else"
+ with self.assertRaises(ValidationError):
+ payment.save()
+
+ payment = PayableItemFactory.create()
+ payment.quick_pay_order_id = "something else"
+ with self.assertRaises(ValidationError):
+ payment.save()
+
+ def test_get_payment_link(self):
+ # Creates a payment item and gets a payment link
+ payment = PayableItemFactory.create()
+ link = payment.get_link()
+ self.assertTrue("https://payment.quickpay.net/payments" in link)
+
+ def test_get_payment_status(self):
+ # Tests that we can get a payment status
+ payment = PayableItemFactory.create()
+ self.assertEqual(payment.get_status(), "initial")
+
+ def test_get_item(self):
+ # Tests that we can retrive both the paid item and the name.
+ payment = PayableItemFactory.create()
+ self.assertEqual(payment.get_item(), payment.membership)
+ self.assertEqual(payment.get_item_name(), "Medlemsskab")
+
+ def test_show_amount(self):
+ # Tests that we can retrive both the paid item and the name.
+ payment = PayableItemFactory.create(amount_ore=10000)
+ self.assertEqual(payment.show_amount(), "100,00")
+
+ def test_amount_less_than_1kr(self):
+ # Tests that we can retrive both the paid item and the name.
+ with self.assertRaises(ValidationError):
+ PayableItemFactory.create(amount_ore=10)
+
+ def test_cant_connect_to_quickpay(self):
+ with self.settings(QUICKPAY_URL="http://test.com/"):
+ with self.assertRaises(HTTPError):
+ PayableItemFactory.create()
+
+ payment = PayableItemFactory.create()
+ with self.settings(QUICKPAY_URL="http://test.com/"):
+ with self.assertRaises(HTTPError):
+ payment.get_link()
+
+ def test_to_string(self):
+ payment = PayableItemFactory()
+ payment_string = str(payment)
+ self.assertIn(str(payment.person), payment_string)
+ self.assertIn(str(payment.show_amount()), payment_string)
+ self.assertIn(str(payment.get_item()), payment_string)
diff --git a/members/urls.py b/members/urls.py
index 15f6167c..40c81774 100644
--- a/members/urls.py
+++ b/members/urls.py
@@ -8,6 +8,7 @@
EntryPage,
userCreated,
ConfirmFamily,
+ MembershipView,
QuickpayCallback,
ActivitySignup,
DepartmentSignView,
@@ -16,6 +17,8 @@
departmentView,
Activities,
AdminSignup,
+ PaymentsView,
+ QuickPayCallbackNew,
)
from django.contrib.auth import views as auth_views
from graphene_django.views import GraphQLView
@@ -70,6 +73,11 @@
url(r"volunteer$", volunteerSignup, name="volunteer_signup"),
url(r"user_created/$", userCreated, name="user_created"),
url(r"admin_signup/$", AdminSignup, name="admin_signup"),
+ url(r"memberships/$", MembershipView, name="memberships"),
+ url(r"payments/$", PaymentsView, name="payments"),
+ url(
+ r"payments/quickpaycallback$", QuickPayCallbackNew, name="quickpay_callback_new"
+ ),
url(r"family/$", FamilyDetails, name="family_detail"),
url(r"family/Person/(?P[\d]+)/$", PersonUpdate, name="person_update"),
url(r"family/Person/(?P[A-Z]{2})$", PersonCreate, name="person_add"),
diff --git a/members/views/__init__.py b/members/views/__init__.py
index 3da9b69b..b5f0ec4a 100644
--- a/members/views/__init__.py
+++ b/members/views/__init__.py
@@ -1,18 +1,44 @@
-# flake8: noqa # ignored since it is being used in the files
-from members.views.FamilyDetails import FamilyDetails
+from members.views.Activities import Activities
+from members.views.ActivitySignup import ActivitySignup
+from members.views.AdminSignup import AdminSignup
from members.views.ConfirmFamily import ConfirmFamily
+from members.views.DeclineInvitation import DeclineInvitation
+from members.views.DepartmentSignView import DepartmentSignView
+from members.views.departmentView import departmentView
+from members.views.EntryPage import EntryPage
+from members.views.FamilyDetails import FamilyDetails
+from members.views.paymentGatewayErrorView import paymentGatewayErrorView
from members.views.PersonCreate import PersonCreate
from members.views.PersonUpdate import PersonUpdate
-from members.views.WaitingListSetSubscription import WaitingListSetSubscription
-from members.views.DeclineInvitation import DeclineInvitation
-from members.views.ActivitySignup import ActivitySignup
+from members.views.QuickpayCallback import QuickpayCallback
from members.views.UpdatePersonFromForm import UpdatePersonFromForm
-from members.views.EntryPage import EntryPage
from members.views.userCreated import userCreated
from members.views.volunteerSignup import volunteerSignup
-from members.views.QuickpayCallback import QuickpayCallback
-from members.views.DepartmentSignView import DepartmentSignView
-from members.views.paymentGatewayErrorView import paymentGatewayErrorView
-from members.views.departmentView import departmentView
-from members.views.Activities import Activities
-from members.views.AdminSignup import AdminSignup
+from members.views.WaitingListSetSubscription import WaitingListSetSubscription
+
+from .memberships_view import MembershipView
+from .payments_view import PaymentsView
+from .quickpay_callback_new import QuickPayCallbackNew
+
+__all__ = [
+ Activities,
+ ActivitySignup,
+ AdminSignup,
+ ConfirmFamily,
+ DeclineInvitation,
+ DepartmentSignView,
+ departmentView,
+ EntryPage,
+ FamilyDetails,
+ MembershipView,
+ paymentGatewayErrorView,
+ PaymentsView,
+ PersonCreate,
+ PersonUpdate,
+ QuickpayCallback,
+ QuickPayCallbackNew,
+ UpdatePersonFromForm,
+ userCreated,
+ volunteerSignup,
+ WaitingListSetSubscription,
+]
diff --git a/members/views/memberships_view.py b/members/views/memberships_view.py
new file mode 100644
index 00000000..0d311419
--- /dev/null
+++ b/members/views/memberships_view.py
@@ -0,0 +1,58 @@
+from django.contrib.auth.decorators import login_required, user_passes_test
+from django.http import HttpResponseRedirect
+from django.shortcuts import render
+from members.forms import MembershipForm
+from members.models import Membership, PayableItem, Person, Union
+from members.utils.user import has_user, user_to_person
+
+
+@login_required
+@user_passes_test(has_user, "/admin_signup/")
+def MembershipView(request):
+
+ logged_in_person = user_to_person(request.user)
+ family_members = Person.objects.filter(family=logged_in_person.family)
+ unions = Union.objects.all()
+ current_memberships = Membership.objects.filter(person__in=family_members).order_by(
+ "person", "sign_up_date", "union"
+ )
+ if request.method == "GET":
+ form = MembershipForm(family_members)
+ return render(
+ request,
+ "members/memberships.html",
+ {
+ # TODO check for closed unions:
+ "unions": unions,
+ "family_members": family_members,
+ "current_memberships": current_memberships,
+ "form": form,
+ },
+ )
+ elif request.method == "POST":
+ form = MembershipForm(family_members, request.POST)
+ if form.is_valid():
+ membership = Membership.objects.create(
+ person=form.cleaned_data["person"], union=form.cleaned_data["union"]
+ )
+ payment = PayableItem.objects.create(
+ person=logged_in_person,
+ amount_ore=membership.union.membership_price_ore,
+ membership=membership,
+ )
+ base_url = "/".join(request.build_absolute_uri().split("/")[:3])
+ return HttpResponseRedirect(
+ payment.get_link(base_url=base_url, continue_page="payments")
+ )
+ else:
+ return render(
+ request,
+ "members/memberships.html",
+ {
+ # TODO check for closed unions:
+ "unions": unions,
+ "family_members": family_members,
+ "current_memberships": current_memberships,
+ "form": form,
+ },
+ )
diff --git a/members/views/payments_view.py b/members/views/payments_view.py
new file mode 100644
index 00000000..e97b59e0
--- /dev/null
+++ b/members/views/payments_view.py
@@ -0,0 +1,13 @@
+from django.contrib.auth.decorators import login_required, user_passes_test
+from django.shortcuts import render
+from members.models import PayableItem, Person
+from members.utils.user import has_user, user_to_person
+
+
+@login_required
+@user_passes_test(has_user, "/admin_signup/")
+def PaymentsView(request):
+ logged_in_person = user_to_person(request.user)
+ family_members = Person.objects.filter(family=logged_in_person.family)
+ payments = PayableItem.objects.filter(person__in=family_members).order_by("-added")
+ return render(request, "members/payments.html", {"payments": payments},)
diff --git a/members/views/quickpay_callback_new.py b/members/views/quickpay_callback_new.py
new file mode 100644
index 00000000..ec291fc7
--- /dev/null
+++ b/members/views/quickpay_callback_new.py
@@ -0,0 +1,9 @@
+from django.http import HttpResponse
+from django.views.decorators.csrf import csrf_exempt
+from members.models import PayableItem
+
+
+@csrf_exempt
+def QuickPayCallbackNew(request):
+ PayableItem.send_all_payment_confirmations()
+ return HttpResponse("OK")