WIP: Payments app

accommodation/mailer.py

@@ -13,15 +13,15 @@
 
 We look forward to seeing you in Cardiff!
 
-~ The PyCon UK 2017 team
+~ The PyCon UK 2018 team
 '''.strip()
 
 
 def send_booking_confirmation_mail(booking):
     body = INVITATION_TEMPLATE.format(room_description=booking.room_description())
 
     send_mail(
-        f'PyCon UK 2017 accommodation confirmation',
+        f'PyCon UK 2018 accommodation confirmation',
         body,
         booking.guest.email_addr,
     )

accommodation/templates/accommodation/booking_payment.html

@@ -28,7 +28,7 @@ <h1>Accommodation booking payment</h1>
           data-currency="gbp"
           data-name="PyCon UK Society Ltd"
           data-image="{% static 'ironcage/img/yellow.png' %}"
-          data-description="PyCon UK 2017 accommodation"
+          data-description="PyCon UK 2018 accommodation"
           data-locale="auto"
           data-email="{{ user.email_addr }}"
         >

accommodation/templates/accommodation/booking_receipt.html

@@ -1,7 +1,7 @@
 {% extends 'ironcage/base.html' %}
 
 {% block content %}
-<h1>Receipt for PyCon UK 2017 accommodation</h1>
+<h1>Receipt for PyCon UK 2018 accommodation</h1>
 
 <p>Issued by the PyCon UK Society Ltd, c/o Acconomy, Arena Business Centre, Holyrood Close, Poole, BH17 7FJ, United Kingdom (VAT Number 249244982)</p>
 

accommodation/tests/test_views.py

@@ -129,8 +129,8 @@ def test_post_stripe_success(self):
         self.assertEqual(len(mail.outbox), 1)
         email = mail.outbox[0]
         self.assertEqual(email.to, [self.alice.email_addr])
-        self.assertEqual(email.from_email, 'PyCon UK 2017 <[email protected]>')
-        self.assertEqual(email.subject, 'PyCon UK 2017 accommodation confirmation')
+        self.assertEqual(email.from_email, 'PyCon UK 2018 <[email protected]>')
+        self.assertEqual(email.subject, 'PyCon UK 2018 accommodation confirmation')
         self.assertIn(ROOMS[1].description, email.body)
 
         backend = get_slack_backend()

accommodation/views.py

@@ -8,7 +8,7 @@
 from django.contrib import messages
 from django.shortcuts import redirect, render
 
-from ironcage.stripe_integration import create_charge
+from payments.stripe_integration import create_charge
 
 from .mailer import send_booking_confirmation_mail
 from .models import Booking, available_rooms, get_room_by_key, has_availability
@@ -49,7 +49,7 @@ def booking_payment(request):
             token = request.POST['stripeToken']
             charge = create_charge(
                 room.cost_incl_vat * 100,
-                'PyCon UK 2017 accommodation',
+                'PyCon UK 2018 accommodation',
                 'PyCon UK accommodation',
                 token
             )

accounts/models.py

@@ -112,7 +112,9 @@ def get_short_name(self):
 
     def get_ticket(self):
         try:
-            return self.ticket
+            if self.ticket and (self.ticket.rate == Ticket.FREE or self.ticket.invoice.successful_payment):
+                return self.ticket
+            return None
         except Ticket.DoesNotExist:
             return None
 

accounts/templates/registration/password_reset_email.html

@@ -6,4 +6,4 @@
 
 Your username, in case you've forgotten: {{ user.get_username }}
 
-~ The PyCon UK 2017 team
+~ The PyCon UK 2018 team

accounts/views.py

@@ -12,7 +12,6 @@ def profile(request):
 
     context = {
         'name': user.name,
-        'orders': user.orders.all(),
         'ticket': user.get_ticket(),
     }
     return render(request, 'accounts/profile.html', context)

cfp/models.py

@@ -125,8 +125,8 @@ def is_interested_for_form(self, user):
 
 
 class Vote(models.Model):
-    proposal = models.ForeignKey('Proposal')
-    user = models.ForeignKey(settings.AUTH_USER_MODEL)
+    proposal = models.ForeignKey('Proposal', on_delete=models.CASCADE)
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
     is_interested = models.BooleanField(default=True)
 
     created_at = models.DateTimeField(auto_now_add=True)

children/actions.py

@@ -3,7 +3,7 @@
 
 from django.db import transaction
 
-from ironcage.stripe_integration import create_charge_for_order
+from payments.stripe_integration import create_charge_for_invoice
 
 from .mailer import send_order_confirmation_mail
 from .models import Order
@@ -36,7 +36,7 @@ def process_stripe_charge(order, token):
     logger.info('children:process_stripe_charge', order=order.order_id, token=token)
     assert order.payment_required()
     try:
-        charge = create_charge_for_order(order, token)
+        charge = create_charge_for_invoice(order, token)
         confirm_order(order, charge.id, charge.created)
     except stripe.error.CardError as e:
         mark_order_as_failed(order, e._message)

children/mailer.py

@@ -20,7 +20,7 @@ def send_order_confirmation_mail(order):
     body = re.sub('\n\n\n+', '\n\n', body_raw)
 
     send_mail(
-        f"PyCon UK 2017 children's day order confirmation ({order.order_id})",
+        f"PyCon UK 2018 children's day order confirmation ({order.order_id})",
         body,
         order.purchaser.email_addr,
     )

children/templates/children/emails/order-confirmation.txt

@@ -1,11 +1,11 @@
 Hi {{ purchaser_name }},
 
-You have purchased {{ num_tickets }} ticket{{ num_tickets|pluralize }} for the children's day at PyCon UK 2017.
+You have purchased {{ num_tickets }} ticket{{ num_tickets|pluralize }} for the children's day at PyCon UK 2018.
 
 You can view your order at:
 
     {{ order_url }}
 
 Best wishes,
 
-~ The PyCon UK 2017 team
+~ The PyCon UK 2018 team

children/templates/children/order.html

@@ -24,7 +24,7 @@ <h1>Details of your children's day order ({{ order.order_id }})</h1>
       data-currency="gbp"
       data-name="PyCon UK Society Ltd"
       data-image="{% static 'ironcage/img/yellow.png' %}"
-      data-description="PyCon UK 2017 order {{ order.order_id }}"
+      data-description="PyCon UK 2018 order {{ order.order_id }}"
       data-locale="auto"
       data-email="{{ order.purchaser.email_addr }}"
     >

children/tests/test_mailer.py

@@ -23,7 +23,7 @@ def test_send_order_confirmation_mail(self):
         self.assertEqual(len(mail.outbox), 1)
         email = mail.outbox[0]
         self.assertEqual(email.to, ['[email protected]'])
-        self.assertEqual(email.from_email, 'PyCon UK 2017 <[email protected]>')
-        self.assertEqual(email.subject, f"PyCon UK 2017 children's day order confirmation ({order.order_id})")
-        self.assertTrue(re.search(r"You have purchased 1 ticket for the children's day at PyCon UK 2017", email.body))
+        self.assertEqual(email.from_email, 'PyCon UK 2018 <[email protected]>')
+        self.assertEqual(email.subject, f"PyCon UK 2018 children's day order confirmation ({order.order_id})")
+        self.assertTrue(re.search(r"You have purchased 1 ticket for the children's day at PyCon UK 2018", email.body))
         self.assertTrue(re.search(fr'http://testserver/children/orders/{order.order_id}/', email.body))

dinners/mailer.py

@@ -9,7 +9,7 @@
 
 def send_booking_confirmation_mail(booking):
     user = booking.guest
-    subject = f'PyCon UK 2017 dinner confirmation | {user.user_id}'
+    subject = f'PyCon UK 2018 dinner confirmation | {user.user_id}'
 
     template = get_template('dinners/emails/order-confirmation.txt')
     context = {

dinners/templates/dinners/conference_dinner_payment.html

@@ -36,7 +36,7 @@ <h1>Conference dinner payment</h1>
           data-currency="gbp"
           data-name="PyCon UK Society Ltd"
           data-image="{% static 'ironcage/img/yellow.png' %}"
-          data-description="PyCon UK 2017 conference dinner"
+          data-description="PyCon UK 2018 conference dinner"
           data-locale="auto"
           data-email="{{ user.email_addr }}"
         >

dinners/templates/dinners/conference_dinner_receipt.html

@@ -1,13 +1,13 @@
 {% extends 'ironcage/base.html' %}
 
 {% block content %}
-<h1>Receipt for PyCon UK 2017 conference dinner</h1>
+<h1>Receipt for PyCon UK 2018 conference dinner</h1>
 
 <p>Issued by the PyCon UK Society Ltd, c/o Acconomy, Arena Business Centre, Holyrood Close, Poole, BH17 7FJ, United Kingdom (VAT Number 249244982)</p>
 
 <p>Issued to {{ booking.guest.name }}</p>
 
-<p>Ticket for PyCon UK 2017 conference dinner</p>
+<p>Ticket for PyCon UK 2018 conference dinner</p>
 
 <div class="row">
   <div class="col-md-4">
@@ -49,7 +49,7 @@ <h1>Receipt for PyCon UK 2017 conference dinner</h1>
 
   <tbody>
     <tr>
-      <td>Ticket for PyCon UK 2017 conference dinner</td>
+      <td>Ticket for PyCon UK 2018 conference dinner</td>
       <td>1</td>
       <td>£25</td>
       <td>£30</td>

dinners/templates/dinners/emails/order-confirmation.txt

@@ -18,5 +18,5 @@ You can download a receipt at :
 
 Best wishes,
 
-~ The PyCon UK 2017 team
+~ The PyCon UK 2018 team
 {% endautoescape %}

dinners/tests/test_views.py

@@ -274,4 +274,4 @@ def test_get_when_booked_as_contributor(self):
     def test_get_when_booked(self):
         factories.create_paid_booking(self.alice)
         rsp = self.client.get(self.url, follow=True)
-        self.assertContains(rsp, 'Receipt for PyCon UK 2017 conference dinner')
+        self.assertContains(rsp, 'Receipt for PyCon UK 2018 conference dinner')

dinners/views.py

@@ -7,7 +7,7 @@
 from django.contrib import messages
 from django.shortcuts import redirect, render
 
-from ironcage.stripe_integration import create_charge
+from payments.stripe_integration import create_charge
 
 from .forms import ConferenceDinnerForm, ContributorsDinnerForm, WhichDinnerForm
 from .mailer import send_booking_confirmation_mail
@@ -131,7 +131,7 @@ def conference_dinner_payment(request):
             token = request.POST['stripeToken']
             charge = create_charge(
                 CONFERENCE_DINNER_PRICE_PENCE,
-                'PyCon UK 2017 dinner',
+                'PyCon UK 2018 dinner',
                 'PyCon UK dinner',
                 token
             )

emails/templates/emails/cfp-proposals-notification.txt

@@ -90,7 +90,7 @@ Hi {{ recipient.name }},
         assistance.
 
       {% elif application.requested_ticket_only %}
-        You have applied for a complementary ticket for PyCon UK 2017, and we're
+        You have applied for a complementary ticket for PyCon UK 2018, and we're
         also pleased to tell you that we can offer you a ticket for the conference.
 
         We will send instructions for claiming your ticket in the next few days.

emails/templates/emails/schedule-days.txt

@@ -1,7 +1,7 @@
 Hi {{ recipient.name }},
 
 We mentioned in an email last week that we have published a provisional
-day-by-day schedule for PyCon UK 2017, which you can find our website at
+day-by-day schedule for PyCon UK 2018, which you can find our website at
 http://2017.pyconuk.org/schedule/.
 
 We'd like to minimise further changes to the schedule; so if you can't speak on

emails/templates/emails/ukpa-ticket-holders.txt

@@ -5,7 +5,7 @@ Python Association, a newly-formed charity whose purpose is support the Python
 community in the UK.  You can read more about the UKPA on the conference
 website[1].
 
-The UKPA is a membership organisation, and anybody who attends PyCon UK 2017 is
+The UKPA is a membership organisation, and anybody who attends PyCon UK 2018 is
 entitled to membership.  For now, membership entitles you to vote to elect the
 organisation's trustees.  You can indicate that you would like to join the UKPA
 when you fill out your profile[2].

emails/tests.py

@@ -50,6 +50,6 @@ def test_wet_run(self):
         self.assertEqual(len(mail.outbox), 2)
         email = mail.outbox[0]
         self.assertEqual(email.to, ['[email protected]'])
-        self.assertEqual(email.from_email, 'PyCon UK 2017 <[email protected]>')
+        self.assertEqual(email.from_email, 'PyCon UK 2018 <[email protected]>')
         self.assertEqual(email.subject, f'This is a test | {self.alice.user_id}')
         self.assertIn('Hi Alice', email.body)

grants/forms.py

@@ -6,11 +6,11 @@
 
 
 DAY_CHOICES = [
-    ('thu', 'Thursday'),
-    ('fri', 'Friday'),
     ('sat', 'Saturday'),
     ('sun', 'Sunday'),
     ('mon', 'Monday'),
+    ('tue', 'Tuesday'),
+    ('wed', 'Wednesday'),
 ]
 
 

grants/migrations/0003_change_days.py

@@ -0,0 +1,23 @@
+# Generated by Django 2.0.2 on 2018-03-31 12:16
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('grants', '0002_auto_20170827_1856'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='application',
+            old_name='fri',
+            new_name='tue',
+        ),
+        migrations.RenameField(
+            model_name='application',
+            old_name='thu',
+            new_name='wed',
+        ),
+    ]

grants/models.py

@@ -12,11 +12,11 @@ class Application(models.Model):
     applicant = models.OneToOneField(settings.AUTH_USER_MODEL, related_name='grant_application', on_delete=models.CASCADE)
     amount_requested = models.IntegerField()
     would_like_ticket_set_aside = models.BooleanField()
-    thu = models.BooleanField()
-    fri = models.BooleanField()
     sat = models.BooleanField()
     sun = models.BooleanField()
     mon = models.BooleanField()
+    tue = models.BooleanField()
+    wed = models.BooleanField()
     about_you = models.TextField()
     amount_offered = models.IntegerField(default=0)
     requested_ticket_only = models.BooleanField(default=False)

grants/tests/factories.py

@@ -11,10 +11,10 @@ def create_application(user=None):
         applicant=user,
         amount_requested=1000,
         would_like_ticket_set_aside=False,
-        thu=False,
-        fri=False,
         sat=True,
         sun=True,
         mon=True,
+        tue=False,
+        wed=False,
         about_you='I have two thumbs',
     )

grants/tests/test_views.py

@@ -87,7 +87,7 @@ def test_post(self):
         self.client.force_login(self.alice)
         form_data = {
             'amount_requested': '2000',
-            'days': ['fri', 'sat', 'sun', 'mon'],
+            'days': ['sat', 'sun', 'mon', 'tue'],
             'about_you': 'I have two thumbs',
         }
         rsp = self.client.post(f'/grants/applications/{self.application.application_id}/edit/', form_data, follow=True)
@@ -96,7 +96,7 @@ def test_post(self):
         application = self.alice.get_grant_application()
         application.refresh_from_db()
         self.assertEqual(application.amount_requested, 2000)
-        self.assertEqual(application.days(), ['Friday', 'Saturday', 'Sunday', 'Monday'])
+        self.assertEqual(application.days(), ['Saturday', 'Sunday', 'Monday', 'Tuesday'])
 
     def test_get_when_not_authenticated(self):
         rsp = self.client.get(f'/grants/applications/{self.application.application_id}/edit/')
@@ -242,7 +242,7 @@ def test_get_application_edit_with_token(self):
     def test_post_application_edit(self):
         form_data = {
             'amount_requested': '2000',
-            'days': ['fri', 'sat', 'sun', 'mon'],
+            'days': ['sat', 'sun', 'mon', 'tue'],
             'about_you': 'I have two thumbs',
         }
         rsp = self.client.post(f'/grants/applications/{self.application.application_id}/edit/', form_data, follow=True)
@@ -252,7 +252,7 @@ def test_post_application_edit(self):
     def test_post_application_edit_with_token(self):
         form_data = {
             'amount_requested': '2000',
-            'days': ['fri', 'sat', 'sun', 'mon'],
+            'days': ['sat', 'sun', 'mon', 'tue'],
             'about_you': 'I have two thumbs',
         }
         rsp = self.client.post(f'/grants/applications/{self.application.application_id}/edit/?deadline-bypass-token=abc123', form_data, follow=True)

ironcage/management/commands/sendtestemail.py

@@ -11,7 +11,7 @@ def add_arguments(self, parser):
 
     def handle(self, *args, to_addr, **kwargs):
         send_mail(
-            'PyCon UK 2017 test email',
+            'PyCon UK 2018 test email',
             f'This is a test, generated at {datetime.now()}',
             to_addr,
         )