From fc52fab23152aaaff12c457c3d15f405e3416e24 Mon Sep 17 00:00:00 2001
From: Diana Huang <dkh@edx.org>
Date: Thu, 29 Aug 2013 16:45:50 -0400
Subject: [PATCH] Go skip verification step if student is already verified.
---
common/djangoapps/course_modes/views.py | 8 ++++
lms/djangoapps/verify_student/models.py | 4 +-
lms/djangoapps/verify_student/urls.py | 6 +++
lms/djangoapps/verify_student/views.py | 52 ++++++++++++++++++----
lms/templates/verify_student/verified.html | 43 ++++++++++++++++++
5 files changed, 103 insertions(+), 10 deletions(-)
create mode 100644 lms/templates/verify_student/verified.html
diff --git a/common/djangoapps/course_modes/views.py b/common/djangoapps/course_modes/views.py
index 9c812a588af..d55943f3542 100644
--- a/common/djangoapps/course_modes/views.py
+++ b/common/djangoapps/course_modes/views.py
@@ -16,6 +16,7 @@ from course_modes.models import CourseMode
from courseware.access import has_access
from student.models import CourseEnrollment
from student.views import course_from_id
+from verify_student.models import SoftwareSecurePhotoVerification
class ChooseModeView(View):
@@ -81,6 +82,13 @@ class ChooseModeView(View):
donation_for_course = request.session.get("donation_for_course", {})
donation_for_course[course_id] = amount_value
request.session["donation_for_course"] = donation_for_course
+ if SoftwareSecurePhotoVerification.user_has_valid_or_pending(request.user):
+ return redirect(
+ "{}?{}".format(
+ reverse('verify_student_verified'),
+ urlencode(dict(course_id=course_id))
+ )
+ )
return redirect(
"{}?{}".format(
diff --git a/lms/djangoapps/verify_student/models.py b/lms/djangoapps/verify_student/models.py
index 7d9b9799c85..f90ceec259e 100644
--- a/lms/djangoapps/verify_student/models.py
+++ b/lms/djangoapps/verify_student/models.py
@@ -175,7 +175,7 @@ class PhotoVerification(StatusModel):
return cls.objects.filter(
user=user,
status="approved",
- created_at__lte=earliest_allowed_date
+ created_at__gte=earliest_allowed_date
).exists()
@classmethod
@@ -191,7 +191,7 @@ class PhotoVerification(StatusModel):
return cls.objects.filter(
user=user,
status__in=valid_statuses,
- created_at__lte=earliest_allowed_date
+ created_at__gte=earliest_allowed_date
).exists()
@classmethod
diff --git a/lms/djangoapps/verify_student/urls.py b/lms/djangoapps/verify_student/urls.py
index f5fc5d2f7e7..83c2812f91f 100644
--- a/lms/djangoapps/verify_student/urls.py
+++ b/lms/djangoapps/verify_student/urls.py
@@ -35,6 +35,12 @@ urlpatterns = patterns(
name="verify_student_verify"
),
+ url(
+ r'^verified',
+ views.VerifiedView.as_view(),
+ name="verify_student_verified"
+ ),
+
url(
r'^create_order',
views.create_order,
diff --git a/lms/djangoapps/verify_student/views.py b/lms/djangoapps/verify_student/views.py
index 5ee24893d84..7e68c112511 100644
--- a/lms/djangoapps/verify_student/views.py
+++ b/lms/djangoapps/verify_student/views.py
@@ -14,6 +14,7 @@ from django.http import HttpResponse, HttpResponseBadRequest
from django.shortcuts import redirect
from django.views.generic.base import View
from django.utils.translation import ugettext as _
+from django.utils.http import urlencode
from course_modes.models import CourseMode
from student.models import CourseEnrollment
@@ -31,10 +32,16 @@ class VerifyView(View):
def get(self, request):
"""
"""
+ course_id = request.GET['course_id']
# If the user has already been verified within the given time period,
# redirect straight to the payment -- no need to verify again.
if SoftwareSecurePhotoVerification.user_has_valid_or_pending(request.user):
- progress_state = "payment"
+ return redirect(
+ "{}?{}".format(
+ reverse('verify_student_verified'),
+ urlencode(dict(course_id=course_id))
+ )
+ )
else:
# If they haven't completed a verification attempt, we have to
# restart with a new one. We can't reuse an older one because we
@@ -42,7 +49,6 @@ class VerifyView(View):
# bookkeeping-wise just to start over.
progress_state = "start"
- course_id = request.GET['course_id']
verify_mode = CourseMode.mode_for_course(course_id, "verified")
if course_id in request.session.get("donation_for_course", {}):
chosen_price = request.session["donation_for_course"][course_id]
@@ -65,13 +71,43 @@ class VerifyView(View):
return render_to_response('verify_student/photo_verification.html', context)
+class VerifiedView(View):
+ """
+ View that gets shown once the user has already gone through the
+ verification flow
+ """
+ def get(self, request):
+ """
+ Handle the case where we have a get request
+ """
+ course_id = request.GET['course_id']
+ verify_mode = CourseMode.mode_for_course(course_id, "verified")
+ if course_id in request.session.get("donation_for_course", {}):
+ chosen_price = request.session["donation_for_course"][course_id]
+ else:
+ chosen_price = verify_mode.min_price.format("{:g}")
+
+ context = {
+ "course_id": course_id,
+ "course_name": course_from_id(course_id).display_name,
+ "purchase_endpoint": get_purchase_endpoint(),
+ "currency": verify_mode.currency.upper(),
+ "chosen_price": chosen_price,
+ }
+ return render_to_response('verify_student/verified.html', context)
+
+
def create_order(request):
+ """
+ Submit PhotoVerification and create a new Order for this verified cert
+ """
attempt = SoftwareSecurePhotoVerification(user=request.user)
- attempt.status = "pending"
+ attempt.status = "ready"
attempt.save()
course_id = request.POST['course_id']
- contribution = request.POST.get("contribution", 0)
+ donation_for_course = request.session.get('donation_for_course', {})
+ contribution = request.POST.get("contribution", donation_for_course.get(course_id, 0))
try:
amount = decimal.Decimal(contribution).quantize(decimal.Decimal('.01'), rounding=decimal.ROUND_DOWN)
except decimal.InvalidOperation:
@@ -98,19 +134,19 @@ def create_order(request):
def show_requirements(request):
"""This might just be a plain template without a view."""
- context = { "course_id" : request.GET.get("course_id") }
+ context = { "course_id": request.GET.get("course_id") }
return render_to_response("verify_student/show_requirements.html", context)
def face_upload(request):
- context = { "course_id" : "edX/Certs101/2013_Test" }
+ context = { "course_id": "edX/Certs101/2013_Test" }
return render_to_response("verify_student/face_upload.html", context)
def photo_id_upload(request):
- context = { "course_id" : "edX/Certs101/2013_Test" }
+ context = { "course_id": "edX/Certs101/2013_Test" }
return render_to_response("verify_student/photo_id_upload.html", context)
def final_verification(request):
- context = { "course_id" : "edX/Certs101/2013_Test" }
+ context = { "course_id": "edX/Certs101/2013_Test" }
return render_to_response("verify_student/final_verification.html", context)
def show_verification_page(request):
diff --git a/lms/templates/verify_student/verified.html b/lms/templates/verify_student/verified.html
new file mode 100644
index 00000000000..0fece909abe
--- /dev/null
+++ b/lms/templates/verify_student/verified.html
@@ -0,0 +1,43 @@
+<%! from django.utils.translation import ugettext as _ %>
+<%! from django.core.urlresolvers import reverse %>
+<%inherit file="../main.html" />
+<%namespace name='static' file='/static_content.html'/>
+<%block name="js_extra">
+<script type="text/javascript">
+var submitToPaymentProcessing = function(event) {
+ event.preventDefault();
+ var xhr = $.post(
+ "create_order",
+ {
+ "course_id" : "${course_id}",
+ },
+ function(data) {
+ for (prop in data) {
+ $('<input>').attr({
+ type: 'hidden',
+ name: prop,
+ value: data[prop]
+ }).appendTo('#pay_form');
+ }
+ }
+ )
+ .done(function(data) {
+ $("#pay_form").submit();
+ })
+ .fail(function(jqXhr,text_status, error_thrown) { alert(jqXhr.responseText); });
+}
+$(document).ready(function() {
+ $("#pay_button").click(submitToPaymentProcessing);
+});
+</script>
+</%block>
+<%block name="content">
+ <p>You have already been verified. Hooray!</p>
+ <p>You have decided to pay $${chosen_price}</p>
+ <form id="pay_form" method="post" action="${purchase_endpoint}">
+ <input type="hidden" name="csrfmiddlewaretoken" value="${ csrf_token }">
+ <input type="hidden" name="course_id" value="${course_id | h}" />
+ <button type="submit" class="action-primary" id="pay_button">Go to Secure Payment</button>
+ </form>
+
+</%block>
--
GitLab