Merge pull request #9373 from edx/ahsan/ECOM-2114-Add-USD-to-prices-on-track-selection-pages

Add USD labels to prices on track selection pages

common/templates/course_modes/choose.html

@@ -91,7 +91,7 @@ from django.core.urlresolvers import reverse
                                                     <ul class="list-actions">
                                                         <li class="action action-select">
                                                             <input type="hidden" name="contribution" value="${min_price}" />
-                                                            <input type="submit" name="verified_mode" value="${_('Pursue a Verified Certificate')} ($${min_price})" />
+                                                            <input type="submit" name="verified_mode" value="${_('Pursue a Verified Certificate')} ($${min_price} USD)" />
                                                         </li>
                                                     </ul>
                                                 </div>
@@ -117,7 +117,7 @@ from django.core.urlresolvers import reverse
                                                     <ul class="list-actions">
                                                         <li class="action action-select">
                                                             <input type="hidden" name="contribution" value="${min_price}" />
-                                                            <input type="submit" name="verified_mode" value="${_('Pursue a Verified Certificate')} ($${min_price})" />
+                                                            <input type="submit" name="verified_mode" value="${_('Pursue a Verified Certificate')} ($${min_price} USD)" />
                                                         </li>
                                                     </ul>
                                                 </div>

lms/djangoapps/courseware/tests/test_about.py

@@ -430,7 +430,7 @@ class AboutPurchaseCourseTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase):
         url = reverse('about_course', args=[self.course.id.to_deprecated_string()])
         resp = self.client.get(url)
         self.assertEqual(resp.status_code, 200)
-        self.assertIn("Add buyme to Cart ($10)", resp.content)
+        self.assertIn("Add buyme to Cart <span>($10 USD)</span>", resp.content)
 
     def test_logged_in(self):
         """
@@ -440,7 +440,7 @@ class AboutPurchaseCourseTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase):
         url = reverse('about_course', args=[self.course.id.to_deprecated_string()])
         resp = self.client.get(url)
         self.assertEqual(resp.status_code, 200)
-        self.assertIn("Add buyme to Cart ($10)", resp.content)
+        self.assertIn("Add buyme to Cart <span>($10 USD)</span>", resp.content)
 
     def test_already_in_cart(self):
         """
@@ -455,7 +455,7 @@ class AboutPurchaseCourseTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase):
         resp = self.client.get(url)
         self.assertEqual(resp.status_code, 200)
         self.assertIn("This course is in your", resp.content)
-        self.assertNotIn("Add buyme to Cart ($10)", resp.content)
+        self.assertNotIn("Add buyme to Cart <span>($10 USD)</span>", resp.content)
 
     def test_already_enrolled(self):
         """
@@ -474,7 +474,7 @@ class AboutPurchaseCourseTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase):
         self.assertEqual(resp.status_code, 200)
         self.assertIn("You are registered for this course", resp.content)
         self.assertIn("View Courseware", resp.content)
-        self.assertNotIn("Add buyme to Cart ($10)", resp.content)
+        self.assertNotIn("Add buyme to Cart <span>($10 USD)</span>", resp.content)
 
     def test_closed_enrollment(self):
         """
@@ -494,7 +494,7 @@ class AboutPurchaseCourseTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase):
         resp = self.client.get(url)
         self.assertEqual(resp.status_code, 200)
         self.assertIn("Enrollment is Closed", resp.content)
-        self.assertNotIn("Add buyme to Cart ($10)", resp.content)
+        self.assertNotIn("Add buyme to Cart <span>($10 USD)</span>", resp.content)
 
         # course price is visible ihe course_about page when the course
         # mode is set to honor and it's price is set
@@ -531,7 +531,7 @@ class AboutPurchaseCourseTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase):
         url = reverse('about_course', args=[course.id.to_deprecated_string()])
         resp = self.client.get(url)
         self.assertEqual(resp.status_code, 200)
-        self.assertIn("Add buyme to Cart ($10)", resp.content)
+        self.assertIn("Add buyme to Cart <span>($10 USD)</span>", resp.content)
 
         # note that we can't call self.enroll here since that goes through
         # the Django student views, which doesn't allow for enrollments

lms/djangoapps/courseware/tests/test_microsites.py

@@ -220,5 +220,7 @@ class TestMicrosites(ModuleStoreTestCase, LoginEnrollmentTestCase):
         resp = self.client.get(url, HTTP_HOST=settings.MICROSITE_TEST_HOSTNAME)
         self.assertEqual(resp.status_code, 200)
         self.assertNotIn("Register for {}".format(self.course_with_visibility.id.course), resp.content)
-        self.assertIn("Add {} to Cart ($10)".format(self.course_with_visibility.id.course), resp.content)
+        self.assertIn("Add {} to Cart <span>($10 USD)</span>".format(
+            self.course_with_visibility.id.course
+        ), resp.content)
         self.assertIn('$("#add_to_cart_post").click', resp.content)

lms/static/sass/multicourse/_course_about.scss

@@ -113,6 +113,9 @@
             &:hover, &:focus {
               color: rgb(255,255,255);
             }
+            span {
+              display: inline-block;
+            }
           }
 
           a {

lms/templates/courseware/course_about.html

@@ -167,8 +167,9 @@ from edxmako.shortcuts import marketing_link
             reg_element_id = "reg_then_add_to_cart"
           %>
           <a href="${reg_href}" class="add-to-cart" id="${reg_element_id}">
-            ${_("Add {course_name} to Cart ({price})")\
+            ${_("Add {course_name} to Cart <span>({price} USD)</span>")\
               .format(course_name=course.display_number_with_default, price=course_price)}
+
           </a>
           <div id="register_error"></div>
         %else:

lms/templates/verify_student/make_payment_step.underscore

@@ -101,7 +101,7 @@
   <div class="payment-buttons nav-wizard is-ready center">
     <input type="hidden" name="contribution" value="<%- minPrice %>" />
     <div class="purchase">
-      <p class="product-info"><span class="product-name"></span> <%- gettext( "price" ) %>: <span class="price">$<%- minPrice %></span></p>
+      <p class="product-info"><span class="product-name"></span> <%- gettext( "price" ) %>: <span class="price">$<%- minPrice %> USD</span></p>
     </div>
     <div class="pay-options">
       <%