From 42fa0f184466f9c1ccccd4bd99a1c86a6898fa09 Mon Sep 17 00:00:00 2001 From: Tanner Collin Date: Tue, 2 May 2023 17:49:39 +0000 Subject: [PATCH] Fix bugs from unreporting printer transactions --- apiserver/apiserver/api/models.py | 2 +- apiserver/apiserver/api/serializers.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apiserver/apiserver/api/models.py b/apiserver/apiserver/api/models.py index 7f168ef..7ccd119 100644 --- a/apiserver/apiserver/api/models.py +++ b/apiserver/apiserver/api/models.py @@ -72,7 +72,7 @@ class Transaction(models.Model): member_id = models.IntegerField(blank=True, null=True) date = models.DateField(default=today_alberta_tz) amount = models.DecimalField(max_digits=7, decimal_places=2) - reference_number = models.CharField(max_length=32, blank=True, null=True) + reference_number = models.CharField(max_length=64, blank=True, null=True) memo = models.TextField(blank=True, null=True) number_of_membership_months = models.IntegerField(blank=True, null=True) payment_method = models.TextField(blank=True, null=True) diff --git a/apiserver/apiserver/api/serializers.py b/apiserver/apiserver/api/serializers.py index e770d01..1def532 100644 --- a/apiserver/apiserver/api/serializers.py +++ b/apiserver/apiserver/api/serializers.py @@ -158,7 +158,8 @@ class TransactionSerializer(serializers.ModelSerializer): current_protocoin = (user.transactions.aggregate(Sum('protocoin'))['protocoin__sum'] or 0) - instance.protocoin new_protocoin = current_protocoin + validated_data['protocoin'] if new_protocoin < 0: - raise ValidationError(dict(category='Insufficient funds. Member only had {} protocoin.'.format(current_protocoin))) + msg = 'Negative Protocoin transaction updated:\n' + str(validated_data) + utils.alert_tanner(msg) return super().update(instance, validated_data)