From f580f1fce52bacd3331ffa87b6eb5f199a561b20 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Sun, 13 Nov 2016 13:54:59 +0100 Subject: [PATCH] Add meta_info to orders --- .../base/migrations/0046_order_meta_info.py | 20 +++++++++++++++++++ src/pretix/base/models/orders.py | 4 ++++ src/pretix/base/services/orders.py | 15 ++++++++------ src/pretix/presale/checkoutflow.py | 7 +++++-- src/pretix/presale/signals.py | 11 ++++++++++ 5 files changed, 49 insertions(+), 8 deletions(-) create mode 100644 src/pretix/base/migrations/0046_order_meta_info.py diff --git a/src/pretix/base/migrations/0046_order_meta_info.py b/src/pretix/base/migrations/0046_order_meta_info.py new file mode 100644 index 0000000000..0e073d5684 --- /dev/null +++ b/src/pretix/base/migrations/0046_order_meta_info.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.2 on 2016-11-13 12:11 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('pretixbase', '0045_auto_20161108_1542'), + ] + + operations = [ + migrations.AddField( + model_name='order', + name='meta_info', + field=models.TextField(blank=True, null=True, verbose_name='Meta information'), + ), + ] diff --git a/src/pretix/base/models/orders.py b/src/pretix/base/models/orders.py index 103304c527..6fe3a41100 100644 --- a/src/pretix/base/models/orders.py +++ b/src/pretix/base/models/orders.py @@ -164,6 +164,10 @@ class Order(LoggedModel): expiry_reminder_sent = models.BooleanField( default=False ) + meta_info = models.TextField( + verbose_name=_("Meta information"), + null=True, blank=True + ) class Meta: verbose_name = _("Order") diff --git a/src/pretix/base/services/orders.py b/src/pretix/base/services/orders.py index e71b1a6ad7..c4c76ad3da 100644 --- a/src/pretix/base/services/orders.py +++ b/src/pretix/base/services/orders.py @@ -1,3 +1,4 @@ +import json import logging from collections import Counter, namedtuple from datetime import datetime, timedelta @@ -263,7 +264,8 @@ def _check_positions(event: Event, now_dt: datetime, positions: List[CartPositio @transaction.atomic def _create_order(event: Event, email: str, positions: List[CartPosition], now_dt: datetime, - payment_provider: BasePaymentProvider, locale: str=None, address: int=None): + payment_provider: BasePaymentProvider, locale: str=None, address: int=None, + meta_info: dict=None): from datetime import date, time total = sum([c.price for c in positions]) @@ -298,7 +300,8 @@ def _create_order(event: Event, email: str, positions: List[CartPosition], now_d locale=locale, total=total, payment_fee=payment_fee, - payment_provider=payment_provider.identifier + payment_provider=payment_provider.identifier, + meta_info=json.dumps(meta_info or {}), ) OrderPosition.transform_cart_positions(positions, order) @@ -320,7 +323,7 @@ def _create_order(event: Event, email: str, positions: List[CartPosition], now_d def _perform_order(event: str, payment_provider: str, position_ids: List[str], - email: str, locale: str, address: int): + email: str, locale: str, address: int, meta_info: dict=None): event = Event.objects.get(id=event) responses = register_payment_providers.send(event) @@ -339,7 +342,7 @@ def _perform_order(event: str, payment_provider: str, position_ids: List[str], raise OrderError(error_messages['internal']) _check_positions(event, now_dt, positions) order = _create_order(event, email, positions, now_dt, pprov, - locale=locale, address=address) + locale=locale, address=address, meta_info=meta_info) if event.settings.get('invoice_generate') == 'True' and invoice_qualified(order): if not order.invoices.exists(): @@ -584,10 +587,10 @@ class OrderChangeManager: @app.task(bind=True, max_retries=5, default_retry_delay=1) def perform_order(self, event: str, payment_provider: str, positions: List[str], - email: str=None, locale: str=None, address: int=None): + email: str=None, locale: str=None, address: int=None, meta_info: dict=None): try: try: - return _perform_order(event, payment_provider, positions, email, locale, address) + return _perform_order(event, payment_provider, positions, email, locale, address, meta_info) except LockTimeoutException: self.retry() except (MaxRetriesExceededError, LockTimeoutException): diff --git a/src/pretix/presale/checkoutflow.py b/src/pretix/presale/checkoutflow.py index 4c2dc78d3e..64e3927dc0 100644 --- a/src/pretix/presale/checkoutflow.py +++ b/src/pretix/presale/checkoutflow.py @@ -16,7 +16,7 @@ from pretix.base.services.orders import OrderError, perform_order from pretix.base.signals import register_payment_providers from pretix.multidomain.urlreverse import eventreverse from pretix.presale.forms.checkout import ContactForm, InvoiceAddressForm -from pretix.presale.signals import checkout_flow_steps +from pretix.presale.signals import checkout_flow_steps, order_meta_from_request from pretix.presale.views import CartMixin, get_cart_total from pretix.presale.views.async import AsyncAction from pretix.presale.views.questions import QuestionsViewMixin @@ -335,9 +335,12 @@ class ConfirmStep(CartMixin, AsyncAction, TemplateFlowStep): def post(self, request): self.request = request + meta_info = {} + for receiver, response in order_meta_from_request.send(sender=request.event, request=request): + meta_info.update(response) return self.do(self.request.event.id, self.payment_provider.identifier, [p.id for p in self.positions], request.session.get('email'), - translation.get_language(), self.invoice_address.pk) + translation.get_language(), self.invoice_address.pk, meta_info) def get_success_message(self, value): return None diff --git a/src/pretix/presale/signals.py b/src/pretix/presale/signals.py index 9ae39cdd20..03647faffb 100644 --- a/src/pretix/presale/signals.py +++ b/src/pretix/presale/signals.py @@ -37,6 +37,17 @@ This signal is sent out to display additional information on the "redeem a vouch As with all plugin signals, the ``sender`` keyword argument will contain the event. """ +order_meta_from_request = EventPluginSignal( + providing_args=["request"] +) +""" +This signal is sent before an order is created through the pretixpresale frontend. It allows you +to return a dictionary that will be merged in the meta_info attribute of the order. +You will recieve the request triggering the order creation as the ``request`` keyword argument. + +As with all event-plugin signals, the ``sender`` keyword argument will contain the event. +""" + order_info = EventPluginSignal( providing_args=["order"] )