diff --git a/membershipworks/templates/membershipworks/event_invoice.dj.html b/membershipworks/templates/membershipworks/event_invoice.dj.html index 58bee54..7b45406 100644 --- a/membershipworks/templates/membershipworks/event_invoice.dj.html +++ b/membershipworks/templates/membershipworks/event_invoice.dj.html @@ -26,6 +26,11 @@ {% endif %} {% endwith %}

+ {% if now is not None %} +

+ Invoice Date: {{ now|date }} +

+ {% endif %}

Attendees: {{ event.details.cnt }}/{{ event.details.cap }}

@@ -50,7 +55,7 @@
-

Remit to:

+

From:

{{ event.instructor.member.account_name }}
{{ event.instructor.member.address_street }}
@@ -59,6 +64,7 @@ {{ event.instructor.member.address_postal_code }}
{{ event.instructor.member.email }}
+
{{ event.instructor.member.phone }}
diff --git a/membershipworks/templates/membershipworks/event_invoice_pdf.dj.html b/membershipworks/templates/membershipworks/event_invoice_pdf.dj.html index 235e8dd..eff5781 100644 --- a/membershipworks/templates/membershipworks/event_invoice_pdf.dj.html +++ b/membershipworks/templates/membershipworks/event_invoice_pdf.dj.html @@ -17,6 +17,7 @@
+

Bill To:

TwinState MakerSpaces, Inc.
PO Box 100
Lebanon, NH 03766-0100
diff --git a/membershipworks/views.py b/membershipworks/views.py index a90f382..1166393 100644 --- a/membershipworks/views.py +++ b/membershipworks/views.py @@ -359,9 +359,7 @@ class EventDetailView( invoice = EventInvoice( uuid=invoice_uuid, event=event, - # NOTE: this needs to be resolved before the object is - # saved, so cannot use the Now() db function - date_submitted=timezone.now(), + date_submitted=pdf_context["now"], amount=event.total_due_to_instructor, ) # removed), currently used in event_invoice_admin.dj.html.