Merge pull request #19661 from edx/aekao/REVEM-136/tearDownBundlingTest

Tearing down data from bundling test
This commit is contained in:
Audrey
2019-01-28 16:04:55 -05:00
committed by GitHub
2 changed files with 0 additions and 35 deletions

View File

@@ -28,8 +28,6 @@ from lms.djangoapps.commerce.utils import EcommerceService
from lms.djangoapps.experiments.utils import get_experiment_user_metadata_context
from openedx.core.djangoapps.catalog.utils import get_currency_data
from openedx.core.djangoapps.embargo import api as embargo_api
from openedx.core.djangoapps.programs.utils import ProgramDataExtender, ProgramProgressMeter
from openedx.core.djangoapps.waffle_utils import WaffleFlag, WaffleFlagNamespace
from openedx.features.content_type_gating.models import ContentTypeGatingConfig
from openedx.features.course_duration_limits.models import CourseDurationLimitConfig
from student.models import CourseEnrollment
@@ -145,37 +143,7 @@ class ChooseModeView(View):
)
course_id = text_type(course_key)
bundle_data = {}
bundles_on_track_selection = WaffleFlag(WaffleFlagNamespace(name=u'experiments'), u'bundles_on_track_selection')
if bundles_on_track_selection.is_enabled():
# enrollment in the course on this page
current_enrollment = list(CourseEnrollment.enrollments_for_user(request.user).filter(course_id=course_key))
if current_enrollment:
meter = ProgramProgressMeter(request.site, request.user, enrollments=current_enrollment)
meter_inverted_programs = meter.invert_programs()
if len(meter_inverted_programs) > 0:
# program for the course on this page
programs_for_course = meter_inverted_programs.get(course_id)
if programs_for_course:
program_for_course = programs_for_course[0]
program_uuid = program_for_course.get('uuid')
if program_for_course:
# program data with bundle info
program_data = ProgramDataExtender(program_for_course, request.user, mobile_only=False).extend()
skus = program_data.get('skus')
ecommerce_service = EcommerceService()
program_bundle_url = ecommerce_service.get_checkout_page_url(*skus, program_uuid=program_uuid)
bundle_data = {
'program_marketing_site_url': program_data.get('marketing_url'),
'program_bundle_url': program_bundle_url,
'discount_data': program_data.get('discount_data'),
'program_type': program_data.get('type'),
'program_title': program_data.get('title'),
'program_price': program_data.get('full_program_price'),
}
context = {
"bundle_data": bundle_data,
"course_modes_choose_url": reverse(
"course_modes_choose",
kwargs={'course_id': course_id}

View File

@@ -85,9 +85,6 @@ from openedx.features.portfolio_project import INCLUDE_PORTFOLIO_UPSELL_MODAL
%endif
<div id="currency_data" value="${currency_data}"></div>
<script type="application/json" id="bundle-data">
${bundle_data | n, dump_js_escaped_json}
</script>
<div class="container">
% if INCLUDE_UPSELL_MODAL.is_enabled():
${static.renderReact(