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

Clean up names and links for receipts/emails.

Browse Source
This commit is contained in:
Diana Huang
2013-09-06 10:00:56 -04:00
parent 4175db0a67
commit 698872a810
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,7 @@ from datetime import datetime
import pytz
import logging
import smtplib
import textwrap
from django.db import models
from django.conf import settings
@@ -347,8 +348,9 @@ class CertificateItem(OrderItem):
item.status = order.status
item.qty = 1
item.unit_cost = cost
item.line_desc = _("Certificate of Achievement, {mode_name} for course {course_id}").format(mode_name=mode_info.name,
course_id=course_id)
course_name = course_from_id(course_id).display_name
item.line_desc = _("Certificate of Achievement, {mode_name} for course {course}").format(mode_name=mode_info.name,
course=course_name)
item.currency = currency
order.currency = currency
order.save()
@@ -372,6 +374,7 @@ class CertificateItem(OrderItem):
@property
def additional_instruction_text(self):
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}.").format(
billing_email=settings.PAYMENT_SUPPORT_EMAIL)
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))

14
lms/templates/shoppingcart/verified_cert_receipt.html
View File

@@ -1,6 +1,6 @@
<%! from django.utils.translation import ugettext as _ %>
<%! from django.core.urlresolvers import reverse %>
<%! from django.conf import settings %>
<%! from student.views import course_from_id %>
<%inherit file="../main.html" />
<%block name="bodyclass">register verification-process step-confirmation</%block>
@@ -13,6 +13,8 @@
${notification}
</section>
% endif
<% course_id = order_items[0].course_id %>
<% course = course_from_id(course_id) %>
<div class="container">
<section class="wrapper cart-list">
@@ -21,7 +23,7 @@
<h2 class="title">
<span class="wrapper-sts">
<span class="sts">${_("You are registering for")}</span>
<span class="sts-course">[Course Name]</span>
<span class="sts-course">${course.display_name}</span>
</span>
<span class="sts-track">
<span class="sts-track-value">
@@ -103,9 +105,9 @@
% for item in order_items:
<tr>
<td>${item.line_desc}</td>
<td>Starts: [date]
<td>${_("Starts: {start_date}").format(start_date=course.start_date_text)}
<ul class="list-actions">
<li class="action action-course"><a href="">Go to Course</a></li>
<li class="action action-course"><a href="${reverse('course_root', kwargs={'course_id': item.course_id})}">Go to Course</a></li>
</ul>
</td>
</tr>
@@ -114,7 +116,7 @@
</table>
<ul class="list-actions">
<li class="action action-dashboard"><a href="">Go to your Dashboard</a></li>
<li class="action action-dashboard"><a href="${reverse('dashboard')}">Go to your Dashboard</a></li>
</ul>
</div>
@@ -178,7 +180,6 @@
% endif
</div>
<%doc>
<h4 class="title">${_("Billing details:")}</h4>
<div class="copy">
<p>
@@ -189,7 +190,6 @@
${order.bill_to_country.upper()}
</p>
</div>
</%doc>
</li>
</ul>