diff --git a/src/pretix/api/views/organizer.py b/src/pretix/api/views/organizer.py index f1d41959f2..fadee11b27 100644 --- a/src/pretix/api/views/organizer.py +++ b/src/pretix/api/views/organizer.py @@ -168,16 +168,19 @@ class GiftCardViewSet(viewsets.ModelViewSet): value = serializers.DecimalField(max_digits=10, decimal_places=2).to_internal_value( request.data.get('value') ) + text = serializers.CharField(allow_blank=True, allow_null=True).to_internal_value( + request.data.get('text', '') + ) if gc.value + value < Decimal('0.00'): return Response({ 'value': ['The gift card does not have sufficient credit for this operation.'] }, status=status.HTTP_409_CONFLICT) - gc.transactions.create(value=value) + gc.transactions.create(value=value, text=text) gc.log_action( 'pretix.giftcards.transaction.manual', user=self.request.user, auth=self.request.auth, - data={'value': value} + data={'value': value, 'text': text} ) return Response(GiftCardSerializer(gc).data, status=status.HTTP_200_OK) diff --git a/src/pretix/base/migrations/0146_giftcardtransaction_text.py b/src/pretix/base/migrations/0146_giftcardtransaction_text.py new file mode 100644 index 0000000000..04c92c7ce1 --- /dev/null +++ b/src/pretix/base/migrations/0146_giftcardtransaction_text.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.4 on 2020-03-02 11:28 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('pretixbase', '0145_auto_20200210_1038'), + ] + + operations = [ + migrations.AddField( + model_name='giftcardtransaction', + name='text', + field=models.TextField(null=True), + ), + ] diff --git a/src/pretix/base/models/giftcards.py b/src/pretix/base/models/giftcards.py index f92173f0ab..67181fa470 100644 --- a/src/pretix/base/models/giftcards.py +++ b/src/pretix/base/models/giftcards.py @@ -119,6 +119,7 @@ class GiftCardTransaction(models.Model): blank=True, on_delete=models.PROTECT ) + text = models.TextField(blank=True, null=True) class Meta: ordering = ("datetime",) diff --git a/src/pretix/control/templates/pretixcontrol/organizers/giftcard.html b/src/pretix/control/templates/pretixcontrol/organizers/giftcard.html index 89b7e561c6..b6b05d74f7 100644 --- a/src/pretix/control/templates/pretixcontrol/organizers/giftcard.html +++ b/src/pretix/control/templates/pretixcontrol/organizers/giftcard.html @@ -45,50 +45,53 @@ {% trans "Transactions" %} -
| {% trans "Date" %} | -{% trans "Order" %} | -{% trans "Value" %} | -
|---|