From 59b9bddd8a3da097a4fece55c872635738bec56f Mon Sep 17 00:00:00 2001
From: Yingtong Li <runassudo@yingtongli.me>
Date: Sat, 26 Jan 2019 17:22:54 +1100
Subject: [PATCH] Integrate membership renewal with bulletin

---
 .../jinja2/ssmembership/import/review.html    | 26 +++++++++++++++++++
 ssmembership/views.py                         | 10 +++++++
 2 files changed, 36 insertions(+)

diff --git a/ssmembership/jinja2/ssmembership/import/review.html b/ssmembership/jinja2/ssmembership/import/review.html
index 781c8c9..fd3a522 100644
--- a/ssmembership/jinja2/ssmembership/import/review.html
+++ b/ssmembership/jinja2/ssmembership/import/review.html
@@ -67,6 +67,32 @@
 				</select>
 			</div>
 			<div class="ui divider"></div>
+			<h2>Bulletin subscriptions</h2>
+			
+			<div class="ui required inline grid field">
+				<label class="three wide column">Opt-in/out</label>
+				<select id="drop_bulletin_subscribe" class="ui dropdown eleven wide column" name="bulletin_subscribe">
+					<option value="0">Do not email me the MUMUS Bulletin</option>
+					<option value="1" selected>Email me the weekly MUMUS Bulletin</option>
+				</select>
+			</div>
+			<div class="ui inline grid field">
+				<label class="three wide column">Subscriptions</label>
+				<div class="eleven wide column">
+					{% for group in import('sspromotions.models').Group.objects.all() %}
+						{% if group.subscribable %}
+							<div class="field" style="display: inline; margin-right: 1em;">
+								<div class="ui checkbox">
+									<input type="checkbox" name="bulletin_group_{{ group.id }}" id="bulletin_group_{{ group.id }}">
+									<label for="bulletin_group_{{ group.id }}">{{ group.name }}</label>
+								</div>
+							</div>
+						{% endif %}
+					{% endfor %}
+					<p style="margin-top: 0.5em;">The MUMUS Bulletin is now personalised. Choose the groups that you would like to see first in your weekly email bulletin.</p>
+				</div>
+			</div>
+			<div class="ui divider"></div>
 			{% if errors %}
 				<div class="ui visible error message"><ul>
 					{% for error in errors %}
diff --git a/ssmembership/views.py b/ssmembership/views.py
index a1e9e10..5fd0d10 100644
--- a/ssmembership/views.py
+++ b/ssmembership/views.py
@@ -142,6 +142,16 @@ def import_save(request):
 	
 	with transaction.atomic():
 		member.save()
+		
+		# Update bulletin
+		import sspromotions.models
+		sspromotions.models.BulletinSubscription.set_member_subscribed(member, True if request.POST['bulletin_subscribe'] == '1' else False)
+		for group in sspromotions.models.Group.objects.filter(subscribable=True).all():
+			if ('bulletin_group_' + str(group.id)) in request.POST and request.POST['bulletin_group_' + str(group.id)]:
+				group.subscribe_member(member, True)
+			else:
+				group.subscribe_member(member, False)
+		
 		mimport.delete_by_email(request.POST['email_orig'])
 		return render(request, 'ssmembership/import/complete.html')