amal/uncloud
1
0
Fork 0
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
parent 0522927c50
commit e6eba7542b
3 changed files with 39 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
uncloud_django_based/uncloud/uncloud_pay/migrations/0005_auto_20200415_1003.py → uncloud_django_based/uncloud/uncloud_pay/migrations/0006_auto_20200415_1003.py
View file

@ -6,7 +6,7 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('uncloud_pay', '0004_auto_20200409_1225'), ('uncloud_pay', '0005_auto_20200413_0924'),
] ]
operations = [ operations = [

37
uncloud_django_based/uncloud/uncloud_pay/migrations/0007_auto_20200418_0722.py Normal file
View file

File diff suppressed because one or more lines are too long

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