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

Revert "add first purchase discount to courseware (#22058)"

Browse Source 
This reverts commit 059b619794.
This commit is contained in:
julianajlk
2019-10-21 13:57:18 -04:00
committed by GitHub
parent 059b619794
commit 98f907f23c
16 changed files with 66 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/djangoapps/course_modes/tests/test_views.py
View File

@@ -398,8 +398,8 @@ class CourseModeViewTest(CatalogIntegrationMixin, UrlResetMixin, ModuleStoreTest
self.assertEquals(course_mode, expected_mode)
@patch('openedx.features.discounts.utils.can_receive_discount')
@patch('openedx.features.discounts.utils.discount_percentage')
@patch('openedx.features.course_experience.utils.can_receive_discount')
@patch('openedx.features.course_experience.utils.discount_percentage')
def test_discount_on_track_selection(self, discount_percentage_mock, can_receive_discount_mock):
can_receive_discount_mock.return_value = True
discount_percentage_mock.return_value = 15

2
common/djangoapps/course_modes/views.py
View File

@@ -36,7 +36,7 @@ from openedx.core.djangoapps.embargo import api as embargo_api
from openedx.core.djangoapps.enrollments.permissions import ENROLL_IN_COURSE
from openedx.features.content_type_gating.models import ContentTypeGatingConfig
from openedx.features.course_duration_limits.models import CourseDurationLimitConfig
from openedx.features.discounts.utils import get_first_purchase_offer_banner_fragment
from openedx.features.course_experience.utils import get_first_purchase_offer_banner_fragment
from openedx.features.discounts.applicability import discount_percentage
from student.models import CourseEnrollment
from util.db import outer_atomic

2
common/lib/xmodule/xmodule/seq_module.py
View File

@@ -367,7 +367,7 @@ class SequenceModule(SequenceFields, ProctoringFields, XModule):
'banner_text': banner_text,
'save_position': view != PUBLIC_VIEW,
'show_completion': view != PUBLIC_VIEW,
'gated_content': self._get_gated_content_info(prereq_met, prereq_meta_info),
'gated_content': self._get_gated_content_info(prereq_met, prereq_meta_info)
}
fragment.add_content(self.system.render_template("seq_module.html", params))