From d5a898943344c0ff8d3716d1b58a126e1bc23d79 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Sun, 21 Aug 2016 17:49:39 +1000 Subject: [PATCH 1/2] Adds invoice_created templates --- .../emails/invoice_created/message.html | 19 +++++++++++++++++++ .../emails/invoice_created/subject.txt | 1 + 2 files changed, 20 insertions(+) create mode 100644 pinaxcon/templates/registrasion/emails/invoice_created/message.html create mode 100644 pinaxcon/templates/registrasion/emails/invoice_created/subject.txt diff --git a/pinaxcon/templates/registrasion/emails/invoice_created/message.html b/pinaxcon/templates/registrasion/emails/invoice_created/message.html new file mode 100644 index 0000000..eff895d --- /dev/null +++ b/pinaxcon/templates/registrasion/emails/invoice_created/message.html @@ -0,0 +1,19 @@ +{% load i18n %} + +

The following invoice was created as part of an attempt to register at (conference name). Please ensure it is paid by the due date.

+ +{% if invoice.is_unpaid %} +

NOTICE: The below invoice is automatically generated, and will be voided + if you amend your registration before payment, or if discounts or products contained in the + invoice become unavailable. The items and discounts are only reserved until + the invoice due time.

+{% endif %} + +{% url "invoice" invoice.id invoice.user.attendee.access_code as access_url %} +

This invoice is available at http://{{ current_site }}{{ access_url }} -- + You can give this URL to your accounts department to pay your registration. +

+ +
+ +{% include "registrasion/_invoice_details.html" %} diff --git a/pinaxcon/templates/registrasion/emails/invoice_created/subject.txt b/pinaxcon/templates/registrasion/emails/invoice_created/subject.txt new file mode 100644 index 0000000..7b33686 --- /dev/null +++ b/pinaxcon/templates/registrasion/emails/invoice_created/subject.txt @@ -0,0 +1 @@ +{% load i18n %}{% blocktrans %}Invoice {{invoice.id}} from (CONFERENCE_COMPANY){% endblocktrans %} From e34347ecac2454969547fbe5597a3d5a3900010c Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Sun, 21 Aug 2016 17:55:59 +1000 Subject: [PATCH 2/2] Adds invoice_updated templates too --- .../registrasion/emails/invoice_created/message.html | 5 +++-- .../registrasion/emails/invoice_created/subject.txt | 2 +- .../registrasion/emails/invoice_updated/message.html | 1 + .../registrasion/emails/invoice_updated/subject.txt | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 pinaxcon/templates/registrasion/emails/invoice_updated/message.html create mode 100644 pinaxcon/templates/registrasion/emails/invoice_updated/subject.txt diff --git a/pinaxcon/templates/registrasion/emails/invoice_created/message.html b/pinaxcon/templates/registrasion/emails/invoice_created/message.html index eff895d..bef3319 100644 --- a/pinaxcon/templates/registrasion/emails/invoice_created/message.html +++ b/pinaxcon/templates/registrasion/emails/invoice_created/message.html @@ -1,12 +1,13 @@ {% load i18n %} -

The following invoice was created as part of an attempt to register at (conference name). Please ensure it is paid by the due date.

- {% if invoice.is_unpaid %}

NOTICE: The below invoice is automatically generated, and will be voided if you amend your registration before payment, or if discounts or products contained in the invoice become unavailable. The items and discounts are only reserved until the invoice due time.

+ +

Please ensure this invoice is paid by the due date.

+ {% endif %} {% url "invoice" invoice.id invoice.user.attendee.access_code as access_url %} diff --git a/pinaxcon/templates/registrasion/emails/invoice_created/subject.txt b/pinaxcon/templates/registrasion/emails/invoice_created/subject.txt index 7b33686..e5fa82a 100644 --- a/pinaxcon/templates/registrasion/emails/invoice_created/subject.txt +++ b/pinaxcon/templates/registrasion/emails/invoice_created/subject.txt @@ -1 +1 @@ -{% load i18n %}{% blocktrans %}Invoice {{invoice.id}} from (CONFERENCE_COMPANY){% endblocktrans %} +{% load i18n %}Invoice {{ invoice.id }} from (CONFERENCE_COMPANY) diff --git a/pinaxcon/templates/registrasion/emails/invoice_updated/message.html b/pinaxcon/templates/registrasion/emails/invoice_updated/message.html new file mode 100644 index 0000000..aa59ddd --- /dev/null +++ b/pinaxcon/templates/registrasion/emails/invoice_updated/message.html @@ -0,0 +1 @@ +{% include "registrasion/emails/invoice_created/message.html" %} diff --git a/pinaxcon/templates/registrasion/emails/invoice_updated/subject.txt b/pinaxcon/templates/registrasion/emails/invoice_updated/subject.txt new file mode 100644 index 0000000..b851291 --- /dev/null +++ b/pinaxcon/templates/registrasion/emails/invoice_updated/subject.txt @@ -0,0 +1 @@ +{% load i18n %}{{ invoice.get_status_display }} -- Invoice {{ invoice.id }} from (CONFERENCE_COMPANY)