From b9e9cdb2b0bc2eb5b2cbd0dad932de9d46e6bd2f Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Thu, 2 Nov 2017 15:12:32 +0200 Subject: [PATCH] Add new payment event for new members --- members/templates/member_edit.html | 2 +- members/views/members.py | 4 ++++ members/views/utils.py | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/members/templates/member_edit.html b/members/templates/member_edit.html index c8ef05c..4f2c7ea 100644 --- a/members/templates/member_edit.html +++ b/members/templates/member_edit.html @@ -1,7 +1,7 @@ {% extends "members_base.html" %} {% load i18n %} -{% load bootstrap4 %} +{% load bootstrap3 %} {% block content %}
diff --git a/members/views/members.py b/members/views/members.py index eb2a3c4..ada6953 100644 --- a/members/views/members.py +++ b/members/views/members.py @@ -94,11 +94,15 @@ def member_add_many(request, *args, **kwargs): @permission_required('members.add_member', raise_exception=True) def add_many_confirm(request, *args, **kwargs): models = request.session['models'] + payment_source = request.session['payment_source'] try: members, payments = models.members, models.payments + for member in members: member.save() + if not member.payments.exists(): # create payment for new members + payment = Payment.objects.create(member=member, source=payment_source) for payment in payments: payment.save() diff --git a/members/views/utils.py b/members/views/utils.py index 6223cba..8b26496 100644 --- a/members/views/utils.py +++ b/members/views/utils.py @@ -146,6 +146,7 @@ def import_csv(request, *args, **kwargs): payment_table_html = convert_table_to_html(payment_table, request) request.session['models'] = result + request.session['payment_source'] = payment_source context = { 'members': member_table_html, 'payments': payment_table_html