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

begin to fix bill view

This commit is contained in:
Nico Schottelius 2020-06-21 23:54:57 +02:00
parent 11de455d23
commit 662e706eab
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
uncloud_pay/admin.py
View File

@ -47,7 +47,9 @@ class BillAdmin(admin.ModelAdmin):
raise self._get_404_exception(object_id) raise self._get_404_exception(object_id)
output_file = NamedTemporaryFile() output_file = NamedTemporaryFile()
bill_html = render_to_string("bill.html.j2", {'bill': bill}) bill_html = render_to_string("bill.html.j2", {'bill': bill,
'bill_records': bill.bill_records.all()
})
bytestring_to_pdf(bill_html.encode('utf-8'), output_file) bytestring_to_pdf(bill_html.encode('utf-8'), output_file)
response = FileResponse(output_file, content_type="application/pdf") response = FileResponse(output_file, content_type="application/pdf")

14
uncloud_pay/templates/bill.html.j2
View File

@ -717,19 +717,11 @@ oAsAAAAAAACGQNAFAAAAAAAAQyDoAgAAAAAAgCEQdAEAAAAAAMAQCLoAAAAAAABgCP83AL6WQ1Y7
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for record in bill.records %} {% for record in bill_records %}
<tr class="table-list"> <tr class="table-list">
<td>{{ record.description }}</td> <td>A</td>
<td> <td>{{ record.quantity }}
{{ record.recurring_price }} * {{ record.recurring_count }}
{{ record.recurring_period }}
{% if record.one_time_price != 0 %}
+ one time {{ record.one_time_price }}
{% endif %}
</td> </td>
<td>{{ record.amount }}</td>
<td>{{ record.vat_amount }} ({{ record.vat_rate }})</td>
<td class="tr">{{ record.total }}</td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>