Skip to content

Commit

Permalink
feat: change ecommerce receipt confirmation message
Browse files Browse the repository at this point in the history
Review the receipt confirmation message on Ecommerce,
replace the message that says to print this page to obtain a receipt,
with a download link.
fccn/ecommerce-nau-extensions#1
fccn/nau-technical#25
  • Loading branch information
igobranco committed Mar 19, 2024
1 parent dbf82fd commit a23b2e2
Show file tree
Hide file tree
Showing 4 changed files with 95 additions and 64 deletions.
66 changes: 36 additions & 30 deletions ecommerce/nau/conf/locale/en/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-03-14 16:29+0000\n"
"POT-Creation-Date: 2024-03-19 17:33+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand All @@ -26,105 +26,111 @@ msgstr ""
msgid "Thank you for your order!"
msgstr ""

#: templates/edx/checkout/receipt.html:53
#: templates/edx/checkout/receipt.html:58
#, python-brace-format
msgid ""
"Your order is complete. You will receive a confirmation message and your "
"enrollment code(s) at {link_start}{email}{link_end}. If you need a receipt, "
"you can print this page."
"enrollment code(s) at {link_start}{email}{link_end}."
msgstr ""

#: templates/edx/checkout/receipt.html:59
#: templates/edx/checkout/receipt.html:65
#, python-brace-format
msgid ""
"Your order is complete. If you need a receipt, you can print this page. You "
"will also receive a confirmation message with this information at "
"{link_start}{email}{link_end}."
"Your order is complete. You will receive a confirmation message with this "
"information at {link_start}{email}{link_end}."
msgstr ""

#: templates/edx/checkout/receipt.html:79
#: templates/edx/checkout/receipt.html:72
msgid "When the receipt is issued, you can download it from this page."
msgstr ""

#: templates/edx/checkout/receipt.html:73
msgid "To return to this page you can use the order history from main menu."
msgstr ""

#: templates/edx/checkout/receipt.html:92
msgid "Order Number:"
msgstr ""

#: templates/edx/checkout/receipt.html:82
#: templates/edx/checkout/receipt.html:95
msgid "Payment Method:"
msgstr ""

#: templates/edx/checkout/receipt.html:85
#: templates/edx/checkout/receipt.html:98
msgid "Order Date:"
msgstr ""

#: templates/edx/checkout/receipt.html:91
#: templates/edx/checkout/receipt.html:104
msgid "Order Information"
msgstr ""

#: templates/edx/checkout/receipt.html:95
#: templates/edx/checkout/receipt.html:108
#: templates/oscar/basket/partials/hosted_checkout_basket.html:43
msgid "Quantity"
msgstr ""

#: templates/edx/checkout/receipt.html:96
#: templates/edx/checkout/receipt.html:109
msgid "Description"
msgstr ""

#: templates/edx/checkout/receipt.html:97
#: templates/edx/checkout/receipt.html:110
#: templates/oscar/basket/partials/hosted_checkout_basket.html:39
msgid "Item Price"
msgstr ""

#: templates/edx/checkout/receipt.html:101
#: templates/edx/checkout/receipt.html:114
msgid "Quantity:"
msgstr ""

#: templates/edx/checkout/receipt.html:103
#: templates/edx/checkout/receipt.html:116
msgid "Description:"
msgstr ""

#: templates/edx/checkout/receipt.html:112
#: templates/edx/checkout/receipt.html:125
msgid "Item Price:"
msgstr ""

#: templates/edx/checkout/receipt.html:118
#: templates/edx/checkout/receipt.html:131
msgid "Subtotal"
msgstr ""

#: templates/edx/checkout/receipt.html:127
#: templates/edx/checkout/receipt.html:140
msgid "Discount"
msgstr ""

#: templates/edx/checkout/receipt.html:134
#: templates/edx/checkout/receipt.html:147
#, python-format
msgid "%(voucher_discount_amount)s off"
msgstr ""

#: templates/edx/checkout/receipt.html:144
#: templates/edx/checkout/receipt.html:157
#, python-format
msgid "Discount of type %(type)s provided by %(enterprise_name)s"
msgstr ""

#: templates/edx/checkout/receipt.html:149
#: templates/edx/checkout/receipt.html:162
msgid "Discount for your first upgrade"
msgstr ""

#: templates/edx/checkout/receipt.html:152
#: templates/edx/checkout/receipt.html:165
#, python-format
msgid "Discount of type %(type)s is provided."
msgstr ""

#: templates/edx/checkout/receipt.html:166
#: templates/edx/checkout/receipt.html:179
#, python-format
msgid "Courtesy of %(enterprise_name)s."
msgstr ""

#: templates/edx/checkout/receipt.html:179
#: templates/edx/checkout/receipt.html:192
msgid "Total"
msgstr ""

#: templates/edx/checkout/receipt.html:186
#: templates/edx/checkout/receipt.html:199
msgid "Get Your Course Credit"
msgstr ""

#: templates/edx/checkout/receipt.html:188
#: templates/edx/checkout/receipt.html:201
#, python-brace-format
msgid ""
"To receive academic credit for this course, you must apply for credit at the "
Expand All @@ -133,11 +139,11 @@ msgid ""
"dashboard{link_end}, next to the course name."
msgstr ""

#: templates/edx/checkout/receipt.html:203
#: templates/edx/checkout/receipt.html:216
msgid "Go to dashboard"
msgstr ""

#: templates/edx/checkout/receipt.html:206
#: templates/edx/checkout/receipt.html:219
msgid "Find more courses"
msgstr ""

Expand Down
Binary file modified ecommerce/nau/conf/locale/pt_PT/LC_MESSAGES/django.mo
Binary file not shown.
74 changes: 44 additions & 30 deletions ecommerce/nau/conf/locale/pt_PT/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-03-14 16:29+0000\n"
"POT-Creation-Date: 2024-03-19 17:33+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand All @@ -26,111 +26,125 @@ msgstr ""
msgid "Thank you for your order!"
msgstr ""

#: templates/edx/checkout/receipt.html:53
#: templates/edx/checkout/receipt.html:58
#, python-brace-format
msgid ""
"Your order is complete. You will receive a confirmation message and your "
"enrollment code(s) at {link_start}{email}{link_end}. If you need a receipt, "
"you can print this page."
"enrollment code(s) at {link_start}{email}{link_end}."
msgstr ""
"Seu pedido está completo. Você receberá uma mensagem de confirmação e seu(s) "
"código(s) de inscrição em {link_start}{email}{link_end}. Quando o recibo for "
"emitido poderá descarrgá-lo nesta página."

#: templates/edx/checkout/receipt.html:59
#: templates/edx/checkout/receipt.html:65
#, python-brace-format
msgid ""
"Your order is complete. If you need a receipt, you can print this page. You "
"will also receive a confirmation message with this information at "
"{link_start}{email}{link_end}."
"Your order is complete. You will receive a confirmation message with this "
"information at {link_start}{email}{link_end}."
msgstr ""
"O seu pedido está completo. Quando o recibo for emitido poderá descarregá-lo "
"nesta página. Receberá também uma mensagem de confirmação com estas "
"informações em {link_start}{email}{link_end}."

#: templates/edx/checkout/receipt.html:79
#: templates/edx/checkout/receipt.html:72
msgid "When the receipt is issued, you can download it from this page."
msgstr "Quando o recibo for emitido, pode descarregá-lo a partir desta página."

#: templates/edx/checkout/receipt.html:73
msgid "To return to this page you can use the order history from main menu."
msgstr ""
"Para regressar a esta página, pode utilizar o histórico de encomendas a "
"partir do menu principal."

#: templates/edx/checkout/receipt.html:92
msgid "Order Number:"
msgstr ""

#: templates/edx/checkout/receipt.html:82
#: templates/edx/checkout/receipt.html:95
msgid "Payment Method:"
msgstr ""

#: templates/edx/checkout/receipt.html:85
#: templates/edx/checkout/receipt.html:98
msgid "Order Date:"
msgstr ""

#: templates/edx/checkout/receipt.html:91
#: templates/edx/checkout/receipt.html:104
msgid "Order Information"
msgstr ""

#: templates/edx/checkout/receipt.html:95
#: templates/edx/checkout/receipt.html:108
#: templates/oscar/basket/partials/hosted_checkout_basket.html:43
msgid "Quantity"
msgstr "Quantidade"

#: templates/edx/checkout/receipt.html:96
#: templates/edx/checkout/receipt.html:109
msgid "Description"
msgstr ""

#: templates/edx/checkout/receipt.html:97
#: templates/edx/checkout/receipt.html:110
#: templates/oscar/basket/partials/hosted_checkout_basket.html:39
msgid "Item Price"
msgstr "Preço do Item"

#: templates/edx/checkout/receipt.html:101
#: templates/edx/checkout/receipt.html:114
#, fuzzy
#| msgid "Quantity"
msgid "Quantity:"
msgstr "Quantidade"

#: templates/edx/checkout/receipt.html:103
#: templates/edx/checkout/receipt.html:116
msgid "Description:"
msgstr ""

#: templates/edx/checkout/receipt.html:112
#: templates/edx/checkout/receipt.html:125
#, fuzzy
#| msgid "Item Price"
msgid "Item Price:"
msgstr "Preço do Item"

#: templates/edx/checkout/receipt.html:118
#: templates/edx/checkout/receipt.html:131
msgid "Subtotal"
msgstr ""

#: templates/edx/checkout/receipt.html:127
#: templates/edx/checkout/receipt.html:140
msgid "Discount"
msgstr ""

#: templates/edx/checkout/receipt.html:134
#: templates/edx/checkout/receipt.html:147
#, python-format
msgid "%(voucher_discount_amount)s off"
msgstr ""

#: templates/edx/checkout/receipt.html:144
#: templates/edx/checkout/receipt.html:157
#, python-format
msgid "Discount of type %(type)s provided by %(enterprise_name)s"
msgstr ""

#: templates/edx/checkout/receipt.html:149
#: templates/edx/checkout/receipt.html:162
msgid "Discount for your first upgrade"
msgstr ""

#: templates/edx/checkout/receipt.html:152
#: templates/edx/checkout/receipt.html:165
#, python-format
msgid "Discount of type %(type)s is provided."
msgstr ""

#: templates/edx/checkout/receipt.html:166
#: templates/edx/checkout/receipt.html:179
#, python-format
msgid "Courtesy of %(enterprise_name)s."
msgstr ""

#: templates/edx/checkout/receipt.html:179
#: templates/edx/checkout/receipt.html:192
#, fuzzy
#| msgid "Total:"
msgid "Total"
msgstr "Total:"

#: templates/edx/checkout/receipt.html:186
#: templates/edx/checkout/receipt.html:199
msgid "Get Your Course Credit"
msgstr ""

#: templates/edx/checkout/receipt.html:188
#: templates/edx/checkout/receipt.html:201
#, python-brace-format
msgid ""
"To receive academic credit for this course, you must apply for credit at the "
Expand All @@ -139,11 +153,11 @@ msgid ""
"dashboard{link_end}, next to the course name."
msgstr ""

#: templates/edx/checkout/receipt.html:203
#: templates/edx/checkout/receipt.html:216
msgid "Go to dashboard"
msgstr ""

#: templates/edx/checkout/receipt.html:206
#: templates/edx/checkout/receipt.html:219
msgid "Find more courses"
msgstr ""

Expand Down
19 changes: 15 additions & 4 deletions ecommerce/nau/templates/edx/checkout/receipt.html
Original file line number Diff line number Diff line change
Expand Up @@ -49,20 +49,31 @@ <h2 class="thank-you">{% trans "Thank you for your order!" as tmsg %}{{ tmsg | f
{% captureas link_start %}
<a data-hj-suppress href="mailto:{{ order.user.email }}">
{% endcaptureas %}

{% comment %}
NAU custom messages
{% endcomment %}
{% if has_enrollment_code_product %}
{% blocktrans trimmed asvar tmsg %}
Your order is complete. You will receive a confirmation message and your enrollment code(s) at
{link_start}{email}{link_end}. If you need a receipt, you can print this page.
Your order is complete.
You will receive a confirmation message and your enrollment code(s) at
{link_start}{email}{link_end}.
{% endblocktrans %}
{% interpolate_html tmsg email=order.user.email|safe link_end="</a>"|safe link_start=link_start|safe %}
{% else %}
{% blocktrans trimmed asvar tmsg %}
Your order is complete. If you need a receipt, you can print this page.
You will also receive a confirmation message with this information at
Your order is complete.
You will receive a confirmation message with this information at
{link_start}{email}{link_end}.
{% endblocktrans %}
{% interpolate_html tmsg email=order.user.email|safe link_end="</a>"|safe link_start=link_start|safe %}
{% endif %}
{% trans "When the receipt is issued, you can download it from this page." as tmsg %}{{ tmsg | force_escape }}
{% trans "To return to this page you can use the order history from main menu." as tmsg %}{{ tmsg | force_escape }}
{% comment %}
end NAU custom messages
{% endcomment %}

</div>

{% if order.billing_address %}
Expand Down

0 comments on commit a23b2e2

Please sign in to comment.