Commit 06cac195 by Jason Bau

make ENABLE_SHOPPING_CART truly optional

course_about was throwing 500s if ENABLE_SHOPPING_CART=False
parent 427f1184
...@@ -609,7 +609,8 @@ def course_about(request, course_id): ...@@ -609,7 +609,8 @@ def course_about(request, course_id):
registration_price = 0 registration_price = 0
in_cart = False in_cart = False
reg_then_add_to_cart_link = "" reg_then_add_to_cart_link = ""
if settings.MITX_FEATURES.get('ENABLE_PAID_COURSE_REGISTRATION'): if (settings.MITX_FEATURES.get('ENABLE_SHOPPING_CART') and
settings.MITX_FEATURES.get('ENABLE_PAID_COURSE_REGISTRATION')):
registration_price = CourseMode.min_course_price_for_currency(course_id, registration_price = CourseMode.min_course_price_for_currency(course_id,
settings.PAID_COURSE_REGISTRATION_CURRENCY[0]) settings.PAID_COURSE_REGISTRATION_CURRENCY[0])
if request.user.is_authenticated(): if request.user.is_authenticated():
......
...@@ -3,8 +3,12 @@ ...@@ -3,8 +3,12 @@
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from courseware.courses import course_image_url, get_course_about_section from courseware.courses import course_image_url, get_course_about_section
from courseware.access import has_access from courseware.access import has_access
from django.conf import settings
if settings.MITX_FEATURES.get('ENABLE_SHOPPING_CART'):
cart_link = reverse('shoppingcart.views.show_cart') cart_link = reverse('shoppingcart.views.show_cart')
else:
cart_link = ""
%> %>
<%namespace name='static' file='../static_content.html'/> <%namespace name='static' file='../static_content.html'/>
...@@ -26,6 +30,8 @@ ...@@ -26,6 +30,8 @@
$("#class_enroll_form").submit(); $("#class_enroll_form").submit();
event.preventDefault(); event.preventDefault();
}); });
% if settings.MITX_FEATURES.get('ENABLE_SHOPPING_CART') and settings.MITX_FEATURES.get('ENABLE_PAID_COURSE_REGISTRATION'):
add_course_complete_handler = function(jqXHR, textStatus) { add_course_complete_handler = function(jqXHR, textStatus) {
if (jqXHR.status == 200) { if (jqXHR.status == 200) {
location.href = "${cart_link}"; location.href = "${cart_link}";
...@@ -48,7 +54,7 @@ ...@@ -48,7 +54,7 @@
}) })
event.preventDefault(); event.preventDefault();
}); });
% endif
## making the conditional around this entire JS block for sanity ## making the conditional around this entire JS block for sanity
%if settings.MITX_FEATURES.get('RESTRICT_ENROLL_BY_REG_METHOD') and course.enrollment_domain: %if settings.MITX_FEATURES.get('RESTRICT_ENROLL_BY_REG_METHOD') and course.enrollment_domain:
......
...@@ -84,7 +84,7 @@ site_status_msg = get_site_status_msg(course_id) ...@@ -84,7 +84,7 @@ site_status_msg = get_site_status_msg(course_id)
</li> </li>
</ol> </ol>
% if settings.MITX_FEATURES.get('ENABLE_PAID_COURSE_REGISTRATION') and \ % if settings.MITX_FEATURES.get('ENABLE_PAID_COURSE_REGISTRATION') and \
settings.MITX_FEATURES['ENABLE_SHOPPING_CART'] and \ settings.MITX_FEATURES.get('ENABLE_SHOPPING_CART') and \
shoppingcart.models.Order.user_cart_has_items(user): shoppingcart.models.Order.user_cart_has_items(user):
<ol class="user"> <ol class="user">
<li class="primary"> <li class="primary">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment