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

bill cleanup, note next step

Browse source
This commit is contained in:
Nico Schottelius 2020-08-09 14:52:42 +02:00
parent 2b29e300dd
commit 5ceaaf7c90
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
uncloud_pay/models.py
View file

@ -670,6 +670,7 @@ class Product(UncloudModel):
if not when_to_start: if not when_to_start:
when_to_start = timezone.now() when_to_start = timezone.now()
# NEXT: find the latest order, use that one...
# Update order = create new order # Update order = create new order
if self.order: if self.order:
previous_order = self.order previous_order = self.order

16
uncloud_pay/templates/bill.html.j2
View file

@ -672,16 +672,12 @@ oAsAAAAAAACGQNAFAAAAAAAAQyDoAgAAAAAAgCEQdAEAAAAAAMAQCLoAAAAAAABgCP83AL6WQ1Y7
<br> <br>
</div> </div>
<div class="d1"> <div class="d1">
{% if bill.billing_address.organization != "" %} <b>{{ bill.billing_address.organization }}</b><br/>
<b>ORG{{ bill.billing_address.organization }}</b> <b>{{ bill.billing_address.name }}</b><br/>
<br>{{ bill.billing_address }} <bill.owner.email> {{ bill.owner.email }}<br/>
{% else %} {{ bill.billing_address.street }}<br/>
<b>{{ bill.billing_address.name }} <bill.owner.email></b> {{ bill.billing_address.country }} {{ bill.billing_address.postal_code }} {{ bill.billing_address.city }}<br/>
{% endif %}
<br>{{ bill.billing_address.street }}
<br>{{ bill.billing_address.postal_code }} {{ bill.billing_address.city }}
<br>{{ bill.billing_address.country }}
<br>
</div> </div>
<div class="d4"> <div class="d4">
<div class="b1"> <div class="b1">