amal/uncloud
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

convert recurring period into an integerfield

Browse source 
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
This commit is contained in:
Nico Schottelius 2020-05-23 23:38:34 +02:00
commit bcd141730d
3 changed files with 54 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
uncloud_pay/models.py
View file

@ -315,8 +315,9 @@ class BillNico(models.Model):
for order in Order.objects.filter(~Q(recurring_period=RecurringPeriod.ONE_TIME),
Q(starting_date__lt=self.starting_date),
owner=owner):
pass
if order.recurring_period > 0: # avoid div/0 - these are one time payments
pass
@ -661,8 +662,7 @@ class Order(models.Model):
editable=False,
blank=True)
recurring_period = models.CharField(max_length=32,
choices = RecurringPeriod.choices, default = RecurringPeriod.PER_30D)
recurring_period = models.IntegerField(choices = RecurringPeriod.choices, default = RecurringPeriod.PER_30D)
one_time_price = models.DecimalField(default=0.0,
max_digits=AMOUNT_MAX_DIGITS,
@ -766,9 +766,8 @@ class OrderTimothee(models.Model):
editable=False,
blank=True)
recurring_period = models.CharField(max_length=32,
choices = RecurringPeriod.choices,
default = RecurringPeriod.PER_30D)
recurring_period = models.IntegerField(choices = RecurringPeriod.choices,
default = RecurringPeriod.PER_30D)
# Trigger initial bill generation at order creation.
def save(self, *args, **kwargs):