Response to CR

lms/djangoapps/shoppingcart/models.py

@@ -411,10 +411,7 @@ class CertificateItem(OrderItem):
         """
 
         # Only refund verified cert unenrollments that are within bounds of the expiration date
-        if course_enrollment.mode != 'verified':
-            return
-
-        if CourseMode.mode_for_course(course_enrollment.course_id, 'verified') is None:
+        if not course_enrollment.refundable():
             return
 
         target_certs = CertificateItem.objects.filter(course_id=course_enrollment.course_id, user_id=course_enrollment.user, status='purchased', mode='verified')

lms/templates/dashboard.html

@@ -183,9 +183,9 @@
       <h2>${_("Current Courses")}</h2>
     </header>
 
-    % if len(courses) > 0:
+    % if len(course_enrollment_pairs) > 0:
       <ul class="listing-courses">
-        % for course, enrollment in courses:
+        % for course, enrollment in course_enrollment_pairs:
             <% show_courseware_link = (course.id in show_courseware_links_for) %>
             <% cert_status = cert_statuses.get(course.id) %>
             <% show_email_settings = (course.id in show_email_settings_for) %>
@@ -341,4 +341,4 @@
       </div>
     </form>
   </div>
-</section>
+</section>

lms/templates/dashboard/_dashboard_course_listing.html

@@ -157,4 +157,4 @@
 
   </section>
 </article>
-</li>
+</li>