diff --git a/lms/djangoapps/shoppingcart/views.py b/lms/djangoapps/shoppingcart/views.py index 1ad35a7a70..eaa5eaefc2 100644 --- a/lms/djangoapps/shoppingcart/views.py +++ b/lms/djangoapps/shoppingcart/views.py @@ -140,7 +140,19 @@ def update_user_cart(request): old_to_new_id_map = item.order.update_order_type() total_cost = item.order.total_cost - return JsonResponse({"total_cost": total_cost, "oldToNewIdMap": old_to_new_id_map}, 200) + callback_url = request.build_absolute_uri( + reverse("shoppingcart.views.postpay_callback") + ) + cart = Order.get_cart_for_user(request.user) + form_html = render_purchase_form_html(cart, callback_url=callback_url) + + return JsonResponse( + { + "total_cost": total_cost, + "oldToNewIdMap": old_to_new_id_map, + "form_html": form_html, + } + ) return HttpResponseBadRequest('Order item not found in request.') diff --git a/lms/djangoapps/verify_student/tests/test_views.py b/lms/djangoapps/verify_student/tests/test_views.py index 3561cf429b..69597a756d 100644 --- a/lms/djangoapps/verify_student/tests/test_views.py +++ b/lms/djangoapps/verify_student/tests/test_views.py @@ -309,6 +309,8 @@ class TestVerifiedView(ModuleStoreTestCase): """ def setUp(self): self.user = UserFactory.create(username="abc", password="test") + self.user.profile.name = u"Røøsty Bøøgins" + self.user.save() self.client.login(username="abc", password="test") self.course = CourseFactory.create(org='MITx', number='999.1x', display_name='Verified Course') self.course_id = self.course.id @@ -357,6 +359,8 @@ class TestReverifyView(ModuleStoreTestCase): """ def setUp(self): self.user = UserFactory.create(username="rusty", password="test") + self.user.profile.name = u"Røøsty Bøøgins" + self.user.profile.save() self.client.login(username="rusty", password="test") self.course = CourseFactory.create(org='MITx', number='999', display_name='Robot Super Course') self.course_key = self.course.id diff --git a/lms/templates/shoppingcart/shopping_cart.html b/lms/templates/shoppingcart/shopping_cart.html index 0fb52a306d..309203662b 100644 --- a/lms/templates/shoppingcart/shopping_cart.html +++ b/lms/templates/shoppingcart/shopping_cart.html @@ -9,6 +9,7 @@ from django.utils.translation import ugettext as _ %> + <%block name="custom_content">
${_('After this purchase is complete,')}
${order.user.username}
${_('will be enrolled in this course.')}
@@ -141,14 +144,32 @@ from django.utils.translation import ugettext as _
${_('View Courses')}
${_("Make sure your full name on your {platform_name} account ({full_name}) matches your ID. We will also use this as the name on your certificate.").format( - full_name="{name}".format(name=user_full_name), +
${_(u"Make sure your full name on your {platform_name} account ({full_name}) matches your ID. We will also use this as the name on your certificate.").format( + full_name=u"{name}".format(name=user_full_name), platform_name=settings.PLATFORM_NAME, )}
${_("Make sure your full name on your {platform_name} account ({full_name}) matches your ID. We will also use this as the name on your certificate.").format( - full_name="{name}".format(name=user_full_name), +
${_(u"Make sure your full name on your {platform_name} account ({full_name}) matches your ID. We will also use this as the name on your certificate.").format( + full_name=u"{name}".format(name=user_full_name), platform_name=settings.PLATFORM_NAME, )}