forked from uncloud/uncloud
Begin phasing in the uncloudprovider
This commit is contained in:
parent
e03cdf214a
commit
fe4e200dc0
3 changed files with 29 additions and 2 deletions
|
@ -73,7 +73,6 @@ python manage.py migrate
|
||||||
|
|
||||||
# Import VAT rates
|
# Import VAT rates
|
||||||
python manage.py import-vat-rates
|
python manage.py import-vat-rates
|
||||||
|
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
|
|
||||||
* Testing / CLI Access
|
* Testing / CLI Access
|
||||||
|
|
23
uncloud_pay/migrations/0032_uncloudprovider.py
Normal file
23
uncloud_pay/migrations/0032_uncloudprovider.py
Normal file
|
@ -0,0 +1,23 @@
|
||||||
|
# Generated by Django 3.1 on 2020-10-11 15:42
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
import django.db.models.deletion
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('uncloud_pay', '0031_auto_20201006_1655'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='UncloudProvider',
|
||||||
|
fields=[
|
||||||
|
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||||
|
('valid_from', models.DateField()),
|
||||||
|
('valid_to', models.DateField(blank=True)),
|
||||||
|
('billing_address', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='uncloud_pay.billingaddress')),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
]
|
|
@ -1010,7 +1010,12 @@ class Order(models.Model):
|
||||||
|
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return f"Order {self.id}: {self.description} {self.config}"
|
try:
|
||||||
|
conf = " ".join([ f"{key}:{val}" for key,val in self.config['features'].items() if val != 0 ])
|
||||||
|
except KeyError:
|
||||||
|
conf = ""
|
||||||
|
|
||||||
|
return f"Order {self.id}: {self.description} {conf}"
|
||||||
|
|
||||||
class Bill(models.Model):
|
class Bill(models.Model):
|
||||||
"""
|
"""
|
||||||
|
|
Loading…
Reference in a new issue