Merge pull request #7987 from edx/mjevtic/SOL-837

(SOL-837) Added RTL support to payment page

lms/djangoapps/shoppingcart/tests/test_views.py

@@ -1460,7 +1460,7 @@ class ShoppingcartViewsClosedEnrollment(ModuleStoreTestCase):
         self.assertIn(reg_item1, context['shoppingcart_items'][0])
         self.assertEqual(1, len(context['shoppingcart_items']))
         self.assertEqual(True, context['is_course_enrollment_closed'])
-        self.assertIn(self.testing_course.display_name, context['appended_expired_course_names'])
+        self.assertIn(self.testing_course.display_name, context['expired_course_names'])
 
     def test_to_check_that_cart_item_enrollment_is_closed_when_clicking_the_payment_button(self):
         self.login_user()

lms/djangoapps/shoppingcart/views.py

@@ -177,8 +177,6 @@ def show_cart(request):
             Order.remove_cart_item_from_order(expired_item, request.user)
         cart.update_order_type()
 
-    appended_expired_course_names = ", ".join(expired_cart_item_names)
-
     callback_url = request.build_absolute_uri(
         reverse("shoppingcart.views.postpay_callback")
     )
@@ -188,7 +186,7 @@ def show_cart(request):
         'shoppingcart_items': valid_cart_item_tuples,
         'amount': cart.total_cost,
         'is_course_enrollment_closed': is_any_course_expired,
-        'appended_expired_course_names': appended_expired_course_names,
+        'expired_course_names': expired_cart_item_names,
         'site_name': site_name,
         'form_html': form_html,
         'currency_symbol': settings.PAID_COURSE_REGISTRATION_CURRENCY[1],

lms/envs/devstack.py

@@ -132,19 +132,6 @@ FEATURES['ENABLE_DASHBOARD_SEARCH'] = True
 FEATURES['CERTIFICATES_HTML_VIEW'] = True
 
 
-#####################################################################
-# See if the developer has any local overrides.
-try:
-    from .private import *      # pylint: disable=import-error
-except ImportError:
-    pass
-
-#####################################################################
-# Lastly, run any migrations, if needed.
-MODULESTORE = convert_module_store_setting_if_needed(MODULESTORE)
-
-SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd'
-
 ########################## Course Discovery #######################
 FEATURES['ENABLE_COURSE_DISCOVERY'] = True
 FEATURES['COURSES_ARE_BROWSEABLE'] = True
@@ -158,3 +145,24 @@ VERIFY_STUDENT["SOFTWARE_SECURE"] = {
     "API_ACCESS_KEY": "BBBBBBBBBBBBBBBBBBBB",
     "API_SECRET_KEY": "CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC",
 }
+
+
+########################## Shopping cart ##########################
+FEATURES['ENABLE_SHOPPING_CART'] = True
+FEATURES['STORE_BILLING_INFO'] = True
+FEATURES['ENABLE_PAID_COURSE_REGISTRATION'] = True
+FEATURES['ENABLE_COSMETIC_DISPLAY_PRICE'] = True
+
+
+#####################################################################
+# See if the developer has any local overrides.
+try:
+    from .private import *      # pylint: disable=wildcard-import
+except ImportError:
+    pass
+
+#####################################################################
+# Lastly, run any migrations, if needed.
+MODULESTORE = convert_module_store_setting_if_needed(MODULESTORE)
+
+SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd'

lms/templates/shoppingcart/cybersource_form.html

-        <form action="${action}" method="post">
-            % for pk, pv in params.iteritems():
-                <input type="hidden" name="${pk}" value="${pv}" />
-            % endfor
+<%! from django.utils.translation import ugettext as _ %>
+    <form action="${action}" method="post">
+        % for pk, pv in params.iteritems():
+            <input type="hidden" name="${pk}" value="${pv}" aria-hidden="true" />
+        % endfor
 
-                <i class="icon fa fa-caret-right"></i><input type="submit" value="Payment"/>
-        </form>
+        <button type="submit">${_('Payment')}<i class="icon fa fa-caret-right" aria-hidden="true"></i></button>
+    </form>

lms/templates/shoppingcart/receipt.html

@@ -79,7 +79,7 @@ from courseware.courses import course_image_url, get_course_about_section, get_c
             % if reg_code_info['is_redeemed']:
             <td>${reg_code_info['redemption_url']}</td>
             % else:
-            <td><a href="${reg_code_info['redemption_url']}" data-base-url="${site_name}">${reg_code_info['redemption_url']}</a></td>
+            <td><a class="redemption-url" href="${reg_code_info['redemption_url']}" data-base-url="${site_name}">${reg_code_info['redemption_url']}</a></td>
             % endif
             <td>
               % if reg_code_info['is_redeemed']:
@@ -304,17 +304,16 @@ from courseware.courses import course_image_url, get_course_about_section, get_c
               </span>
             </h3>
 
-            <h1>${_(" {course_name} ").format(course_name=course.display_name)}
-              <span class="pull-right">
-                % if course_start_time:
-                  ${course_start_time}
-                %endif
-                -
-                % if course_end_time:
-                  ${course_end_time}
-                %endif
-              </span>
-            </h1>
+            <h1>${course.display_name}</h1>
+            <span class="pull-right">
+              % if course_start_time:
+                ${course_start_time}
+              %endif
+              -
+              % if course_end_time:
+                ${course_end_time}
+              %endif
+            </span>
             <hr/>
             <div class="three-col">
               % if item.status == "purchased":

lms/templates/shoppingcart/shopping_cart_flow.html

@@ -12,17 +12,17 @@ from django.utils.translation import ugettext as _
 <%block name="bodyextra">
 
 <div class="container">
-  <section class="wrapper confirm-enrollment shopping-cart">
+  <header class="wrapper confirm-enrollment shopping-cart">
   <h1> ${_("{platform_name} -  Shopping Cart").format(platform_name=microsite.get_value('platform_name', settings.PLATFORM_NAME))}</h1>
       % if shoppingcart_items:
-      <ul class="steps">
+      <ul class="steps" aria-label="${_('Steps')}">
           <li <%block name="review_highlight"/>>${_('Review')}</li>
           <%block name="billing_details_highlight"/>
           <li <%block name="payment_highlight"/>>${_('Payment')}</li>
           <li <%block name="confirmation_highlight"/>>${_('Confirmation')}</li>
       </ul>
       %endif
-  </section>
+  </header>
 </div>
 <%block name="custom_content"/>