mravi/uncloud-mravi
1
0
Fork 0
forked from uncloud/uncloud
Code Issues Pull requests Projects Releases Wiki Activity

Minor fixes, DB sync after rebase

Browse source
This commit is contained in:
fnux 2020-04-18 09:20:06 +02:00
commit e6eba7542b
3 changed files with 39 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uncloud_django_based/uncloud/uncloud_pay/models.py
View file

@ -514,7 +514,6 @@ class Bill(models.Model):
# A bill is final when its ending date is passed.
return self.ending_date < timezone.now()
<<<<<<< HEAD
def activate_products(self):
for order in self.order_set.all():
# FIXME: using __something might not be a good idea.
@ -523,6 +522,7 @@ class Bill(models.Model):
if product.status == UncloudStatus.AWAITING_PAYMENT:
product.status = UncloudStatus.PENDING
product.save()
@property
def billing_address(self):
return self.order.billing_address