From 24efb4e8d6255033d80b6907baf8bfb5d0440f01 Mon Sep 17 00:00:00 2001
From: Diana Huang <dkh@edx.org>
Date: Mon, 9 Sep 2013 11:50:20 -0400
Subject: [PATCH] Clean up text of Order Confirmation E-mail.

---
 lms/djangoapps/shoppingcart/models.py             | 9 +++++----
 lms/templates/emails/order_confirmation_email.txt | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lms/djangoapps/shoppingcart/models.py b/lms/djangoapps/shoppingcart/models.py
index d613903057..b3c42a8622 100644
--- a/lms/djangoapps/shoppingcart/models.py
+++ b/lms/djangoapps/shoppingcart/models.py
@@ -382,7 +382,8 @@ class CertificateItem(OrderItem):
 
     @property
     def additional_instruction_text(self):
-        return textwrap.dedent(
-            _("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}.").format(
-            billing_email=settings.PAYMENT_SUPPORT_EMAIL))
+        return _("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}. "
+                 "Please include your order number in your e-mail. "
+                 "Please do NOT include your credit card information.").format(
+                     billing_email=settings.PAYMENT_SUPPORT_EMAIL)
diff --git a/lms/templates/emails/order_confirmation_email.txt b/lms/templates/emails/order_confirmation_email.txt
index 7615fd3498..74f945b06a 100644
--- a/lms/templates/emails/order_confirmation_email.txt
+++ b/lms/templates/emails/order_confirmation_email.txt
@@ -1,7 +1,7 @@
 <%! from django.utils.translation import ugettext as _ %>
 ${_("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)}
 
@@ -11,9 +11,9 @@ ${_("The items in your order are:")}
 
 ${_("Quantity - Description - Price")}
 %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
-${_("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:
     ${order_item.additional_instruction_text}