Merge pull request #1010 from edx/vkaracic/SOL-2134

[SOL-2134] Add error message template.

ecommerce/coupons/tests/test_views.py

@@ -12,6 +12,7 @@ from oscar.test.factories import (
     ConditionalOfferFactory, OrderFactory, OrderLineFactory, RangeFactory, VoucherFactory
 )
 from oscar.test.utils import RequestFactory
+from rest_framework import status
 
 from ecommerce.core.url_utils import get_lms_url
 from ecommerce.coupons.tests.mixins import CouponMixin
@@ -263,7 +264,6 @@ class CouponOfferViewTests(ApiMockMixin, CouponMixin, CourseCatalogTestMixin, Lm
 
 class CouponRedeemViewTests(CouponMixin, CourseCatalogTestMixin, LmsApiMockMixin, TestCase):
     redeem_url = reverse('coupons:redeem')
-    HTTP_MOVED = 301
 
     def setUp(self):
         super(CouponRedeemViewTests, self).setUp()
@@ -317,7 +317,7 @@ class CouponRedeemViewTests(CouponMixin, CourseCatalogTestMixin, LmsApiMockMixin
         response = self.client.get(url_without_sku)
         self.assertEqual(response.context['error'], _('SKU not provided.'))
 
-    def test_invalid_voucher(self):
+    def test_invalid_voucher_code(self):
         """ Verify an error is returned when voucher does not exist. """
         code = 'DOESNTEXIST'
         url = self.redeem_url + '?code={}&sku={}'.format(code, self.stock_record.partner_sku)
@@ -332,6 +332,16 @@ class CouponRedeemViewTests(CouponMixin, CourseCatalogTestMixin, LmsApiMockMixin
         response = self.client.get(url)
         self.assertEqual(response.context['error'], _('The product does not exist.'))
 
+    def test_expired_voucher(self):
+        """ Verify an error is returned for expired coupon. """
+        start_datetime = now() - datetime.timedelta(days=20)
+        end_datetime = now() - datetime.timedelta(days=10)
+        code = 'INVALID'
+        __, product = prepare_voucher(code=code, start_datetime=start_datetime, end_datetime=end_datetime)
+        url = self.redeem_url + '?code={}&sku={}'.format(code, StockRecord.objects.get(product=product).partner_sku)
+        response = self.client.get(url)
+        self.assertEqual(response.context['error'], _('This coupon code has expired.'))
+
     @httpretty.activate
     def test_basket_redirect_discount_code(self):
         """ Verify the view redirects to the basket single-item view when a discount code is provided. """
@@ -345,9 +355,9 @@ class CouponRedeemViewTests(CouponMixin, CourseCatalogTestMixin, LmsApiMockMixin
     def test_basket_redirect_enrollment_code(self):
         """ Verify the view redirects to LMS when an enrollment code is provided. """
         self.create_and_test_coupon()
-        httpretty.register_uri(httpretty.GET, self.student_dashboard_url, status=self.HTTP_MOVED)
+        httpretty.register_uri(httpretty.GET, self.student_dashboard_url, status=status.HTTP_301_MOVED_PERMANENTLY)
         self.mock_account_api(self.request, self.user.username, data={'is_active': True})
-        self.assert_redemption_page_redirects(self.student_dashboard_url, target=self.HTTP_MOVED)
+        self.assert_redemption_page_redirects(self.student_dashboard_url, target=status.HTTP_301_MOVED_PERMANENTLY)
 
     @httpretty.activate
     def test_multiple_vouchers(self):
@@ -356,8 +366,8 @@ class CouponRedeemViewTests(CouponMixin, CourseCatalogTestMixin, LmsApiMockMixin
         basket = Basket.get_basket(self.user, self.site)
         basket.vouchers.add(Voucher.objects.get(code=COUPON_CODE))
         self.mock_account_api(self.request, self.user.username, data={'is_active': True})
-        httpretty.register_uri(httpretty.GET, self.student_dashboard_url, status=self.HTTP_MOVED)
-        self.assert_redemption_page_redirects(self.student_dashboard_url, target=self.HTTP_MOVED)
+        httpretty.register_uri(httpretty.GET, self.student_dashboard_url, status=status.HTTP_301_MOVED_PERMANENTLY)
+        self.assert_redemption_page_redirects(self.student_dashboard_url, target=status.HTTP_301_MOVED_PERMANENTLY)
 
     @httpretty.activate
     def test_already_enrolled_rejection(self):

ecommerce/coupons/views.py

@@ -97,24 +97,16 @@ class CouponOfferView(TemplateView):
             try:
                 voucher, products = get_voucher_and_products_from_code(code=code)
             except Voucher.DoesNotExist:
-                return {
-                    'error': _('Coupon does not exist'),
-                }
+                return {'error': _('Coupon does not exist')}
             except exceptions.ProductNotFoundError:
-                return {
-                    'error': _('The voucher is not applicable to your current basket.'),
-                }
+                return {'error': _('The voucher is not applicable to your current basket.')}
             valid_voucher, msg = voucher_is_valid(voucher, products, self.request)
             if valid_voucher:
                 self.template_name = 'coupons/offer.html'
                 return
 
-            return {
-                'error': msg,
-            }
-        return {
-            'error': _('This coupon code is invalid.'),
-        }
+            return {'error': msg}
+        return {'error': _('This coupon code is invalid.')}
 
     @method_decorator(login_required_for_credit)
     def get(self, request, *args, **kwargs):
@@ -158,9 +150,11 @@ class CouponRedeemView(EdxOrderPlacementMixin, View):
             return render(request, template_name, {'error': _('You are not eligible to use this coupon.')})
 
         if not request.user.account_details(request)['is_active']:
-            return render(request, template_name, {
-                'error': _('You need to activate your account in order to redeem this coupon.')
-            })
+            return render(
+                request,
+                template_name,
+                {'error': _('You need to activate your account in order to redeem this coupon.')}
+            )
 
         if request.user.is_user_already_enrolled(request, product):
             return render(request, template_name, {'error': _('You are already enrolled in the course.')})

ecommerce/static/sass/base/_base.scss

@@ -34,14 +34,6 @@ a {
   }
 }
 
-.message-error {
-  border-top: 4px solid #B20610;
-  h3 {
-    margin-bottom: 10px;
-    font-weight: bold;
-  }
-}
-
 .depth {
   padding: 1.25rem 1.25rem;
 }

ecommerce/static/sass/base/main.scss

@@ -34,5 +34,6 @@
 @import 'views/course_admin';
 @import 'views/coupon_admin';
 @import 'views/coupon_offer';
+@import 'views/error';
 
 @import "default";

ecommerce/static/sass/partials/utilities/_variables.scss

@@ -54,3 +54,6 @@ $small-input-width: 174px;
 $input-addon-width: 40px;
 
 $coupon-grid-item-height: 75px;
+
+$container-padding-top: 60px;
+$container-padding-bottom: spacing-vertical(small);

ecommerce/static/sass/partials/views/_coupon_offer.scss

 #offer {
     .container {
-        padding-top: 60px;
-        padding-bottom: spacing-vertical(small);
+        padding-top: $container-padding-top;
+        padding-bottom: $container-padding-bottom;
 
         .row {
             .pagination-block {

ecommerce/static/sass/partials/views/_error.scss

+#error-message {
+  padding-top: $container-padding-top;
+  padding-bottom: $container-padding-bottom;
+}
+
+.message-error-content {
+  border-top: 4px solid #B20610;
+  h3 {
+    margin-bottom: 10px;
+    font-weight: bold;
+  }
+}

ecommerce/static/templates/_offer_error.html

-<div class="depth depth-2 message-error offer-error">
+<div class="depth depth-2 message-error-content offer-error">
     <h3><%= error_msg %></h3>
     <%- gettext('If you need assistance, contact edX support.') %>
 </div>

ecommerce/templates/coupons/_offer_error.html

-{% extends 'edx/base.html' %}
+{% extends 'edx/error.html' %}
 {% load i18n %}
 
 {% block title %}{% trans "Redeem" %}{% endblock %}
-
-{% block navbar %}
-    {% include 'edx/partials/_student_navbar.html' %}
-{% endblock navbar %}
-
-{% block content %}
-    <div id="offer">
-        <div class="container">
-            <div class="depth depth-2 message-error">
-                <h3>{{ error }}</h3>
-                {% trans "If you need assistance, contact edX support." %}
-            </div>
-        </div>
-    </div>
-{% endblock %}
\ No newline at end of file

ecommerce/templates/edx/error.html

+{% extends 'edx/base.html' %}
+{% load i18n %}
+
+{% block title %}{% endblock %}
+
+{% block navbar %}
+    {% include 'edx/partials/_student_navbar.html' %}
+{% endblock navbar %}
+
+{% block content %}
+    <div id="error-message">
+        <div class="container">
+            <div class="depth depth-2 message-error-content">
+                <h3>{{ error }}</h3>
+                {% trans "If you need assistance, contact edX support." %}
+            </div>
+        </div>
+    </div>
+{% endblock %}