CMS/cmsmanage
2
0
Fork 0
Code Issues 8 Pull Requests 3 Actions Projects 1 Releases Activity

membershipworks: Reword event invoice, add date to body
All checks were successful
Ruff / ruff (push) Successful in 2m9s
Details
Test / test (push) Successful in 6m27s
Details

Browse Source
This commit is contained in:
Adam Goldsmith 2024-04-27 10:57:04 -04:00
parent ae1116fea8
commit e6a7e0c974
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
membershipworks/templates/membershipworks/event_invoice.dj.html
View File

@ -26,6 +26,11 @@
{% endif %} {% endif %}
{% endwith %} {% endwith %}
</p> </p>
{% if now is not None %}
<p>
<b>Invoice Date:</b> {{ now|date }}
</p>
{% endif %}
<p> <p>
<b>Attendees:</b> {{ event.details.cnt }}/{{ event.details.cap }} <b>Attendees:</b> {{ event.details.cnt }}/{{ event.details.cap }}
</p> </p>
@ -50,7 +55,7 @@
<div class="vr d-none d-md-block m-4 p-0"></div> <div class="vr d-none d-md-block m-4 p-0"></div>
<div class="col-12 col-md-4"> <div class="col-12 col-md-4">
<div> <div>
<h3>Remit to:</h3> <h3>From:</h3>
<div>{{ event.instructor.member.account_name }}</div> <div>{{ event.instructor.member.account_name }}</div>
<div>{{ event.instructor.member.address_street }}</div> <div>{{ event.instructor.member.address_street }}</div>
<div> <div>
@ -59,6 +64,7 @@
{{ event.instructor.member.address_postal_code }} {{ event.instructor.member.address_postal_code }}
</div> </div>
<div>{{ event.instructor.member.email }}</div> <div>{{ event.instructor.member.email }}</div>
<div>{{ event.instructor.member.phone }}</div>
</div> </div>
</div> </div>
</div> </div>

1
membershipworks/templates/membershipworks/event_invoice_pdf.dj.html
View File

@ -17,6 +17,7 @@
<body style="font-size: 10pt;"> <body style="font-size: 10pt;">
<header> <header>
<h3>Bill To:</h3>
<div>TwinState MakerSpaces, Inc.</div> <div>TwinState MakerSpaces, Inc.</div>
<div>PO Box 100</div> <div>PO Box 100</div>
<div>Lebanon, NH 03766-0100</div> <div>Lebanon, NH 03766-0100</div>

4
membershipworks/views.py
View File

@ -359,9 +359,7 @@ class EventDetailView(
invoice = EventInvoice( invoice = EventInvoice(
uuid=invoice_uuid, uuid=invoice_uuid,
event=event, event=event,
# NOTE: this needs to be resolved before the object is date_submitted=pdf_context["now"],
# saved, so cannot use the Now() db function
date_submitted=timezone.now(),
amount=event.total_due_to_instructor, amount=event.total_due_to_instructor,
) )
# removed), currently used in event_invoice_admin.dj.html. # removed), currently used in event_invoice_admin.dj.html.