From a900cec9e7dc760fe44657a26d1602bb1bd5a339 Mon Sep 17 00:00:00 2001
From: Simon Chen <schen@edx.org>
Date: Thu, 5 Nov 2020 20:43:24 -0500
Subject: [PATCH] MST-338 Update other outstanding links to old IDV into new
 IDV flow (#25526)

---
 common/djangoapps/course_modes/views.py               | 11 ++++-------
 lms/djangoapps/commerce/utils.py                      |  2 +-
 .../dashboard/_dashboard_course_listing.html          |  2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/common/djangoapps/course_modes/views.py b/common/djangoapps/course_modes/views.py
index c93c74bd6c..7e01196f10 100644
--- a/common/djangoapps/course_modes/views.py
+++ b/common/djangoapps/course_modes/views.py
@@ -30,6 +30,7 @@ from common.djangoapps.course_modes.helpers import get_course_final_price
 from edxmako.shortcuts import render_to_response
 from lms.djangoapps.commerce.utils import EcommerceService
 from lms.djangoapps.experiments.utils import get_experiment_user_metadata_context
+from lms.djangoapps.verify_student.services import IDVerificationService
 from openedx.core.djangoapps.catalog.utils import get_currency_data
 from openedx.core.djangoapps.embargo import api as embargo_api
 from openedx.core.djangoapps.enrollments.permissions import ENROLL_IN_COURSE
@@ -111,7 +112,7 @@ class ChooseModeView(View):
         has_enrolled_professional = (CourseMode.is_professional_slug(enrollment_mode) and is_active)
         if CourseMode.has_professional_mode(modes) and not has_enrolled_professional:
             purchase_workflow = request.GET.get("purchase_workflow", "single")
-            verify_url = reverse('verify_student_start_flow', kwargs={'course_id': six.text_type(course_key)})
+            verify_url = IDVerificationService.get_verify_location('verify_student_start_flow', course_id=course_key)
             redirect_url = "{url}?purchase_workflow={workflow}".format(url=verify_url, workflow=purchase_workflow)
             if ecommerce_service.is_enabled(request.user):
                 professional_mode = modes.get(CourseMode.NO_ID_PROFESSIONAL_MODE) or modes.get(CourseMode.PROFESSIONAL)
@@ -310,12 +311,8 @@ class ChooseModeView(View):
             donation_for_course[six.text_type(course_key)] = amount_value
             request.session["donation_for_course"] = donation_for_course
 
-            return redirect(
-                reverse(
-                    'verify_student_start_flow',
-                    kwargs={'course_id': six.text_type(course_key)}
-                )
-            )
+            verify_url = IDVerificationService.get_verify_location('verify_student_start_flow', course_id=course_key)
+            return redirect(verify_url)
 
     def _get_requested_mode(self, request_dict):
         """Get the user's requested mode
diff --git a/lms/djangoapps/commerce/utils.py b/lms/djangoapps/commerce/utils.py
index 7901b1662c..ab5679a149 100644
--- a/lms/djangoapps/commerce/utils.py
+++ b/lms/djangoapps/commerce/utils.py
@@ -141,7 +141,7 @@ class EcommerceService(object):
             if self.is_enabled(user):
                 return self.get_checkout_page_url(verified_mode.sku)
             else:
-                return reverse('verify_student_upgrade_and_verify', args=(course_key,))
+                return reverse('dashboard')
         return None
 
 
diff --git a/lms/templates/dashboard/_dashboard_course_listing.html b/lms/templates/dashboard/_dashboard_course_listing.html
index b3de5ad3d5..254bf81f39 100644
--- a/lms/templates/dashboard/_dashboard_course_listing.html
+++ b/lms/templates/dashboard/_dashboard_course_listing.html
@@ -420,7 +420,7 @@ from lms.djangoapps.experiments.utils import UPSELL_TRACKING_FLAG
                 % if use_ecommerce_payment_flow and course_mode_info['verified_sku']:
                   <a class="action action-upgrade track_course_dashboard_green_button" href="${ecommerce_payment_page}?sku=${course_mode_info['verified_sku']}">
                 % else:
-                  <a class="action action-upgrade track_course_dashboard_green_button" href="${reverse('verify_student_upgrade_and_verify', kwargs={'course_id': six.text_type(course_overview.id)})}" data-course-id="${course_overview.id}" data-user="${user.username}">
+                  <a class="action action-upgrade track_course_dashboard_green_button" href="${IDVerificationService.get_verify_location('verify_student_upgrade_and_verify', course_id=course_overview.id)}" data-course-id="${course_overview.id}" data-user="${user.username}">
                 % endif
                     <span class="action-upgrade-icon" aria-hidden="true"></span>
                   <span class="wrapper-copy">