Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WL-606

Browse Source
This commit is contained in:
asadiqbal
2017-01-11 13:27:24 +05:00
committed by Ayesha Baig
parent c7ff473e6d
commit 8f5ba0115c
8 changed files with 271 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
lms/djangoapps/instructor/tests/test_ecommerce.py
View File

@@ -30,7 +30,7 @@ class TestECommerceDashboardViews(SiteMixin, SharedModuleStoreTestCase):
# URL for instructor dash
cls.url = reverse('instructor_dashboard', kwargs={'course_id': cls.course.id.to_deprecated_string()})
cls.e_commerce_link = '<button type="button" class="btn-link" data-section="e-commerce">E-Commerce</button>'
cls.ecommerce_link = '<button type="button" class="btn-link" data-section="e-commerce">E-Commerce</button>'
def setUp(self):
super(TestECommerceDashboardViews, self).setUp()
@@ -50,7 +50,7 @@ class TestECommerceDashboardViews(SiteMixin, SharedModuleStoreTestCase):
Test Pass E-commerce Tab is in the Instructor Dashboard
"""
response = self.client.get(self.url)
self.assertIn(self.e_commerce_link, response.content)
self.assertIn(self.ecommerce_link, response.content)
# Coupons should show up for White Label sites with priced honor modes.
self.assertIn('Coupon Code List', response.content)
@@ -61,7 +61,7 @@ class TestECommerceDashboardViews(SiteMixin, SharedModuleStoreTestCase):
self.use_site(site=self.site_other)
self.client.login(username=self.instructor.username, password="test")
response = self.client.get(self.url)
self.assertIn(self.e_commerce_link, response.content)
self.assertIn(self.ecommerce_link, response.content)
self.assertIn('Create Enrollment Report', response.content)
def test_reports_section_not_under_e_commerce_tab(self):
@@ -70,12 +70,12 @@ class TestECommerceDashboardViews(SiteMixin, SharedModuleStoreTestCase):
value
"""
response = self.client.get(self.url)
self.assertIn(self.e_commerce_link, response.content)
self.assertIn(self.ecommerce_link, response.content)
self.assertNotIn('Create Enrollment Report', response.content)
def test_user_has_finance_admin_rights_in_e_commerce_tab(self):
response = self.client.get(self.url)
self.assertIn(self.e_commerce_link, response.content)
self.assertIn(self.ecommerce_link, response.content)
# Order/Invoice sales csv button text should render in e-commerce page
self.assertIn('Total Credit Card Purchases', response.content)
@@ -96,7 +96,7 @@ class TestECommerceDashboardViews(SiteMixin, SharedModuleStoreTestCase):
the instructor dashboard
"""
response = self.client.get(self.url)
self.assertIn(self.e_commerce_link, response.content)
self.assertIn(self.ecommerce_link, response.content)
# Total amount html should render in e-commerce page, total amount will be 0
course_honor_mode = CourseMode.mode_for_course(self.course.id, 'honor')
@@ -351,6 +351,39 @@ class TestECommerceDashboardViews(SiteMixin, SharedModuleStoreTestCase):
# Get the response value, ensure the Coupon section is not included.
response = self.client.get(self.url)
self.assertIn(self.e_commerce_link, response.content)
self.assertIn(self.ecommerce_link, response.content)
# Coupons should show up for White Label sites with priced honor modes.
self.assertNotIn('Coupons List', response.content)
def test_coupon_code_section_not_under_e_commerce_tab(self):
"""
Test Coupon Creation UI, under E-commerce Tab, should not be available in the Instructor Dashboard with
e-commerce course
"""
# Setup e-commerce course
CourseMode.objects.filter(course_id=self.course.id).update(sku='test_sku')
response = self.client.get(self.url)
self.assertIn(self.ecommerce_link, response.content)
self.assertNotIn('Coupon Code List', response.content)
def test_enrollment_codes_section_not_under_e_commerce_tab(self):
"""
Test Enrollment Codes UI, under E-commerce Tab, should not be available in the Instructor Dashboard with
e-commerce course
"""
# Setup e-commerce course
CourseMode.objects.filter(course_id=self.course.id).update(sku='test_sku')
response = self.client.get(self.url)
self.assertIn(self.ecommerce_link, response.content)
self.assertNotIn('<h3 class="hd hd-3">Enrollment Codes</h3>', response.content)
def test_enrollment_codes_section_visible_for_non_ecommerce_course(self):
"""
Test Enrollment Codes UI, under E-commerce Tab, should be available in the Instructor Dashboard with non
e-commerce course
"""
response = self.client.get(self.url)
self.assertIn(self.ecommerce_link, response.content)
self.assertIn('<h3 class="hd hd-3">Enrollment Codes</h3>', response.content)

12
lms/djangoapps/instructor/views/instructor_dashboard.py
View File

@@ -285,7 +285,8 @@ def _section_e_commerce(course, access, paid_mode, coupons_enabled, reports_enab
'coupons_enabled': coupons_enabled,
'reports_enabled': reports_enabled,
'course_price': course_price,
'total_amount': total_amount
'total_amount': total_amount,
'is_ecommerce_course': is_ecommerce_course(course_key)
}
return section_data
@@ -695,3 +696,12 @@ def _section_metrics(course, access):
'post_metrics_data_csv_url': reverse('post_metrics_data_csv'),
}
return section_data
def is_ecommerce_course(course_key):
"""
Checks if the given course is an e-commerce course or not, by checking its SKU value from
CourseMode records for the course
"""
sku_count = len([mode.sku for mode in CourseMode.modes_for_course(course_key) if mode.sku])
return sku_count > 0

6
lms/templates/instructor/instructor_dashboard_2/e-commerce.html
View File

@@ -14,7 +14,8 @@ import pytz
<div class="ecommerce-wrapper">
<div class="error-msgs" id="error-msg"></div>
<div id = "accordion">
<div class="wrap">
%if not section_data['is_ecommerce_course']:
<div class="wrap">
<h3 class="hd hd-3">${_('Enrollment Codes')}</h3>
<div>
%if section_data['sales_admin']:
@@ -53,6 +54,7 @@ import pytz
<a id="registration_code_generation_link-trigger" href="#registration_code_generation_modal" rel="leanModal"></a>
</div>
</div>
%endif
<!-- end wrap -->
%if section_data['coupons_enabled']:
<div class="wrap">
@@ -145,7 +147,7 @@ import pytz
</div>
</div><!-- end wrap -->
%endif
%if section_data['coupons_enabled']:
%if section_data['coupons_enabled'] and not section_data['is_ecommerce_course']:
<div class="wrap">
<h3 class="hd hd-3">${_("Coupon Code List")}</h3>
<div>