From 4498830d20b9c7ee59e32662e2214b7e3afb6315 Mon Sep 17 00:00:00 2001
From: Mike Olund <michaelo@openroad.ca>
Date: Tue, 7 Mar 2017 16:47:43 -0800
Subject: [PATCH] Minor changes to pre-qualification flow

---
 edivorce/apps/core/templates/prequalification/step_01.html | 6 ++++++
 edivorce/apps/core/templates/prequalification/step_02.html | 6 ++++++
 edivorce/apps/core/templates/prequalification/step_03.html | 6 ++++++
 edivorce/apps/core/templates/prequalification/step_04.html | 5 +++++
 edivorce/apps/core/templates/prequalification/step_05.html | 6 ++++++
 edivorce/apps/core/templates/prequalification/step_06.html | 5 +++++
 edivorce/apps/core/templates/success.html                  | 2 +-
 edivorce/apps/core/views/main.py                           | 5 ++++-
 edivorce/settings/local.py                                 | 4 +++-
 edivorce/settings/openshift.py                             | 1 +
 10 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/edivorce/apps/core/templates/prequalification/step_01.html b/edivorce/apps/core/templates/prequalification/step_01.html
index f822f003..20e4047b 100644
--- a/edivorce/apps/core/templates/prequalification/step_01.html
+++ b/edivorce/apps/core/templates/prequalification/step_01.html
@@ -3,6 +3,12 @@
 
 {% block title %}{{ block.super }}: Prequalification{% endblock %}
 
+{% block progress %}
+    {% if request.bceid_user.is_authenticated %}
+        {% include "progress.html" with step=active_page %}
+    {% endif %}
+{% endblock %}
+
 {% block content %}
 
 <h1>Do you qualify for a divorce in B.C.?</h1>
diff --git a/edivorce/apps/core/templates/prequalification/step_02.html b/edivorce/apps/core/templates/prequalification/step_02.html
index d1369748..d872a38a 100644
--- a/edivorce/apps/core/templates/prequalification/step_02.html
+++ b/edivorce/apps/core/templates/prequalification/step_02.html
@@ -3,6 +3,12 @@
 
 {% block title %}{{ block.super }}: Prequalification{% endblock %}
 
+{% block progress %}
+    {% if request.bceid_user.is_authenticated %}
+        {% include "progress.html" with step=active_page %}
+    {% endif %}
+{% endblock %}
+
 {% block content %}
 
 <h1>Do you qualify for a divorce in B.C.?</h1>
diff --git a/edivorce/apps/core/templates/prequalification/step_03.html b/edivorce/apps/core/templates/prequalification/step_03.html
index 80a43047..d832e927 100644
--- a/edivorce/apps/core/templates/prequalification/step_03.html
+++ b/edivorce/apps/core/templates/prequalification/step_03.html
@@ -3,6 +3,12 @@
 
 {% block title %}{{ block.super }}: Prequalification{% endblock %}
 
+{% block progress %}
+    {% if request.bceid_user.is_authenticated %}
+        {% include "progress.html" with step=active_page %}
+    {% endif %}
+{% endblock %}
+
 {% block content %}
 
 <h1>Do you qualify for a divorce in B.C.?</h1>
diff --git a/edivorce/apps/core/templates/prequalification/step_04.html b/edivorce/apps/core/templates/prequalification/step_04.html
index 3e065069..0945c4d0 100644
--- a/edivorce/apps/core/templates/prequalification/step_04.html
+++ b/edivorce/apps/core/templates/prequalification/step_04.html
@@ -3,6 +3,11 @@
 
 {% block title %}{{ block.super }}: Prequalification{% endblock %}
 
+{% block progress %}
+    {% if request.bceid_user.is_authenticated %}
+        {% include "progress.html" with step=active_page %}
+    {% endif %}
+{% endblock %}
 {% block content %}
 
 <h1>Do you qualify for a divorce in B.C.?</h1>
diff --git a/edivorce/apps/core/templates/prequalification/step_05.html b/edivorce/apps/core/templates/prequalification/step_05.html
index be16a245..ea75523b 100644
--- a/edivorce/apps/core/templates/prequalification/step_05.html
+++ b/edivorce/apps/core/templates/prequalification/step_05.html
@@ -3,6 +3,12 @@
 
 {% block title %}{{ block.super }}: Prequalification{% endblock %}
 
+{% block progress %}
+    {% if request.bceid_user.is_authenticated %}
+        {% include "progress.html" with step=active_page %}
+    {% endif %}
+{% endblock %}
+
 {% block content %}
 
 <h1>Do you qualify for a divorce in B.C.?</h1>
diff --git a/edivorce/apps/core/templates/prequalification/step_06.html b/edivorce/apps/core/templates/prequalification/step_06.html
index 4e0ecfb8..f8479d4b 100644
--- a/edivorce/apps/core/templates/prequalification/step_06.html
+++ b/edivorce/apps/core/templates/prequalification/step_06.html
@@ -3,6 +3,11 @@
 
 {% block title %}{{ block.super }}: Prequalification{% endblock %}
 
+{% block progress %}
+    {% if request.bceid_user.is_authenticated %}
+        {% include "progress.html" with step=active_page %}
+    {% endif %}
+{% endblock %}
 {% block content %}
 
 <h1>Do you qualify for a divorce in B.C.?</h1>
diff --git a/edivorce/apps/core/templates/success.html b/edivorce/apps/core/templates/success.html
index 10c263fe..8d3a6305 100644
--- a/edivorce/apps/core/templates/success.html
+++ b/edivorce/apps/core/templates/success.html
@@ -19,7 +19,7 @@
         <a class="btn btn-success" href="{% url 'login' %}">
             I Already Have a BCeID.<br>Login Now
         </a>
-        <a class="btn btn-success" href="https://www.bceid.ca/register/basic/account_details.aspx?type=regular&eServiceType=basic">
+        <a class="btn btn-success" href="{{ register_url }}">
             Register<br>for a Basic BCeID
         </a>
     </div>
diff --git a/edivorce/apps/core/views/main.py b/edivorce/apps/core/views/main.py
index f8aac1fb..0e4b14e3 100644
--- a/edivorce/apps/core/views/main.py
+++ b/edivorce/apps/core/views/main.py
@@ -23,7 +23,10 @@ def intro(request):
 
 
 def success(request):
-    return render(request, 'success.html')
+    if request.bceid_user.is_authenticated:
+        return redirect(settings.FORCE_SCRIPT_NAME[:-1] + '/overview')
+    else:
+        return render(request, 'success.html', context={'register_url': settings.REGISTER_URL})
 
 
 def savepdf(request):
diff --git a/edivorce/settings/local.py b/edivorce/settings/local.py
index 6cf9d0bb..103b78d8 100644
--- a/edivorce/settings/local.py
+++ b/edivorce/settings/local.py
@@ -17,4 +17,6 @@ TEMPLATES[0]["OPTIONS"]["debug"] = True
 WEASYPRINT_URL = 'http://localhost:5005'
 WEASYPRINT_CSS_LOOPBACK = 'http://10.200.10.1:8000'
 
-DEPLOYMENT_TYPE = 'localdev'
\ No newline at end of file
+DEPLOYMENT_TYPE = 'localdev'
+REGISTER_URL = '#'
+
diff --git a/edivorce/settings/openshift.py b/edivorce/settings/openshift.py
index f4a29251..82f2c5db 100644
--- a/edivorce/settings/openshift.py
+++ b/edivorce/settings/openshift.py
@@ -71,5 +71,6 @@ WEASYPRINT_CSS_LOOPBACK += PROXY_URL_PREFIX
 # Integration URLs
 PROXY_BASE_URL = 'https://justice.gov.bc.ca'
 LOGOUT_URL = 'https://logon.gov.bc.ca/clp-cgi/logoff.cgi?returl=%s%s&retnow=1' % (PROXY_BASE_URL, PROXY_URL_PREFIX)
+REGISTER_URL = ''