Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up text of Order Confirmation E-mail.

Browse Source
This commit is contained in:
Diana Huang
2013-09-09 11:50:20 -04:00
parent 34d0fe1554
commit 24efb4e8d6
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lms/djangoapps/shoppingcart/models.py
View File

@@ -382,7 +382,8 @@ class CertificateItem(OrderItem):
@property @property
def additional_instruction_text(self): def additional_instruction_text(self):
return textwrap.dedent( return _("Note - you have up to 2 weeks into the course to unenroll from the Verified Certificate option "
_("Note - you have up to 2 weeks into the course to unenroll from the Verified Certificate option \ "and receive a full refund. To receive your refund, contact {billing_email}. "
and receive a full refund. To receive your refund, contact {billing_email}.").format( "Please include your order number in your e-mail. "
billing_email=settings.PAYMENT_SUPPORT_EMAIL)) "Please do NOT include your credit card information.").format(
billing_email=settings.PAYMENT_SUPPORT_EMAIL)

6
lms/templates/emails/order_confirmation_email.txt
View File

@@ -1,7 +1,7 @@
<%! from django.utils.translation import ugettext as _ %> <%! from django.utils.translation import ugettext as _ %>
${_("Hi {name}").format(name=order.user.profile.name)} ${_("Hi {name}").format(name=order.user.profile.name)}
${_("Your payment was successful. You will see the charge below on your next credit or debit card statement. The charge will show up on your statement under the company name {platform_name}. If you have billing questions, please read the FAQ or contact {billing_email}. We hope you enjoy your order.").format(platform_name=settings.PLATFORM_NAME,billing_email=settings.PAYMENT_SUPPORT_EMAIL)} ${_("Your payment was successful. You will see the charge below on your next credit or debit card statement. The charge will show up on your statement under the company name {platform_name}. If you have billing questions, please read the FAQ ({faq_url}) or contact {billing_email}.").format(platform_name=settings.PLATFORM_NAME, billing_email=settings.PAYMENT_SUPPORT_EMAIL, faq_url=marketing_link('FAQ'))}
${_("-The {platform_name} Team").format(platform_name=settings.PLATFORM_NAME)} ${_("-The {platform_name} Team").format(platform_name=settings.PLATFORM_NAME)}
@@ -11,9 +11,9 @@ ${_("The items in your order are:")}
${_("Quantity - Description - Price")} ${_("Quantity - Description - Price")}
%for order_item in order_items: %for order_item in order_items:
${order_item.qty} - ${order_item.line_desc} - ${order_item.line_cost} ${order_item.qty} - ${order_item.line_desc} - ${"$" if order_item.currency == 'usd' else ""}${order_item.line_cost}
%endfor %endfor
${_("Total billed to credit/debit card: {total_cost}").format(total_cost=order.total_cost)} ${_("Total billed to credit/debit card: {currency_symbol}{total_cost}").format(total_cost=order.total_cost, currency_symbol=("$" if order.currency == 'usd' else ""))}
%for order_item in order_items: %for order_item in order_items:
${order_item.additional_instruction_text} ${order_item.additional_instruction_text}