From ab69e0df1c70b1d3fe710a84e1de4c783f0447de Mon Sep 17 00:00:00 2001
From: Ahsan Ulhaq <ahsan.haq@arbisoft.com>
Date: Mon, 27 Jul 2015 15:36:42 +0500
Subject: [PATCH 1/2] Copy & Styling for Credit messages on Dashboard

ECOM-1917
---
 .../djangoapps/student/tests/test_credit.py   |  1 -
 lms/static/sass/multicourse/_dashboard.scss   | 11 ++++
 .../dashboard/_dashboard_credit_info.html     | 65 ++++++++-----------
 3 files changed, 37 insertions(+), 40 deletions(-)

diff --git a/common/djangoapps/student/tests/test_credit.py b/common/djangoapps/student/tests/test_credit.py
index b85d711e2d..f8acdfc946 100644
--- a/common/djangoapps/student/tests/test_credit.py
+++ b/common/djangoapps/student/tests/test_credit.py
@@ -108,7 +108,6 @@ class CreditCourseDashboardTest(ModuleStoreTestCase):
         response = self._load_dashboard()
         self.assertContains(response, "credit-eligibility-msg")
         self.assertContains(response, "purchase-credit-btn")
-        self.assertContains(response, "purchase credit for this course expires")
 
     def test_purchased_credit(self):
         # Simulate that the user has purchased credit, but has not
diff --git a/lms/static/sass/multicourse/_dashboard.scss b/lms/static/sass/multicourse/_dashboard.scss
index 64f10ca9a2..cafc33646a 100644
--- a/lms/static/sass/multicourse/_dashboard.scss
+++ b/lms/static/sass/multicourse/_dashboard.scss
@@ -557,6 +557,17 @@
         @include float(right);
       }
 
+      .pending-credit-btn{
+        @include float(right);
+      }
+
+      .denied-credit-btn{
+        @include float(right);
+      }
+      .credit-request-pending-msg{
+        display: inline-block;
+      }
+
       .credit-btn {
         @extend %btn-pl-yellow-base;
         background-image: none ;
diff --git a/lms/templates/dashboard/_dashboard_credit_info.html b/lms/templates/dashboard/_dashboard_credit_info.html
index 124116886a..2b4f1a459c 100644
--- a/lms/templates/dashboard/_dashboard_credit_info.html
+++ b/lms/templates/dashboard/_dashboard_credit_info.html
@@ -6,6 +6,9 @@
     from util.date_utils import get_default_time_display
 %>
 <%namespace name='static' file='../static_content.html'/>
+% if credit_status["provider_name"]:
+    <% provider_link='<a href="{}" target="_blank">{}</a>'.format(credit_status["provider_status_url"],credit_status["provider_name"]) %>
+% endif
 
 % if credit_status["eligible"]:
     <div class="message message-status is-shown credit-message">
@@ -17,69 +20,53 @@
             )}
         </p>
     % if not credit_status["purchased"] and not credit_status["error"] :
-        <p class="credit-eligibility-msg">
-            % if credit_status["deadline"] < datetime.datetime.now(pytz.UTC) + datetime.timedelta(days=30):
-                ${_("The opportunity to purchase credit for this course expires on {deadline}. You've worked hard - don't miss out!").format(deadline=get_default_time_display(credit_status["deadline"]))}
-            % else:
-                ${_("Congratulations - you have met the requirements for credit in this course!")}
-            % endif
+        <p class="message-copy credit-eligibility-msg">
+            ${_("You are now eligible for credit. {congrats}").format(
+                    congrats="<b>Congratulations</b>",
+                )
+            }
         </p>
         <div class="purchase_credit">
-            <a class="btn credit-btn purchase-credit-btn" href="${settings.ECOMMERCE_PUBLIC_URL_ROOT}/credit/checkout/${credit_status['course_key']}" target="_blank" data-course-key="${credit_status['course_key']}">${_("Purchase Course Credit")}</a>
+            <a class="btn credit-btn purchase-credit-btn" href="${settings.ECOMMERCE_PUBLIC_URL_ROOT}/credit/checkout/${credit_status['course_key']}" target="_blank" data-course-key="${credit_status['course_key']}">${_("Get credit")}</a>
         </div>
     % elif credit_status["request_status"] in [None, "pending"] and not credit_status["error"] :
         % if credit_status["request_status"] == "pending":
             <p class="message-copy credit-request-pending-msg">
-            ${_("Thanks for your payment! We are currently processing your course credit. You'll see a message here when the transaction is complete. For more information, see {provider_link}.").format(
-                    provider_link=u'<a href="{provider_url}">{provider_name}</a>'.format(
-                        provider_url=credit_status["provider_status_url"],
-                        provider_name=credit_status["provider_name"],
+                ${_("Thank you. Your credit is processing. Please see {link} for more information.").format(
+                        link=provider_link,
                     )
-                )
-            }
+                }
             </p>
+            <button class="btn credit-btn pending-credit-btn" data-course-key="${credit_status['course_key']}" data-user="${user.username}" data-provider="${credit_status['provider_id']}">${_("Learn more")}</button>
         % elif credit_status["request_status"] is None:
             <p class="message-copy credit-request-pending-msg">
-            ${_("Thank you for your payment! To receive your course credit, go to the {provider_link} website. You may have to complete some additional steps depending on the institution").format(
-                    provider_link=u'<a href="{provider_url}">{provider_name}</a>'.format(
-                        provider_url=credit_status["provider_status_url"],
-                        provider_name=credit_status["provider_name"],
+                ${_("Thank you for your purchase. Please proceed to {link} to finalize your credit.").format(
+                        link=provider_link,
                     )
-                )
-            }
+                }
             </p>
+            <button class="btn credit-btn pending-credit-btn" data-course-key="${credit_status['course_key']}" data-user="${user.username}" data-provider="${credit_status['provider_id']}">${_("Finalize credit")}</button>
         % endif
 
-        <button class="btn credit-btn pending-credit-btn" data-course-key="${credit_status['course_key']}" data-user="${user.username}" data-provider="${credit_status['provider_id']}">${_("Complete Credit")}</button>
         <form id="credit-pending-form"> </form>
     % elif credit_status["request_status"] == "approved" and not credit_status["error"] :
         <p class="message-copy credit-request-approved-msg">
-        ${_("Congratulations - you have received credit for this course! For more information, see {provider_link}.").format(
-                provider_link=u'<a href="{provider_url}">{provider_name}</a>'.format(
-                    provider_url=credit_status["provider_status_url"],
-                    provider_name=credit_status["provider_name"],
+            ${_("Your credit has been processed and approved. {congrats}. Please see {link} for more information.").format(
+                    congrats="<b>Congratulations</b>",
+                    link=provider_link,
                 )
-            )
-        }
+            }
         </p>
         <a class="btn credit-btn" href="${credit_status['provider_status_url']}" target="_blank">${_("Access credit")}</a>
     % elif credit_status["request_status"] == "rejected" and not credit_status["error"] :
         <p class="message-copy credit-request-rejected-msg">
-        ${_("{provider_name} has declined your request for course credit. For more information, contact {provider_link}.").format(
-                provider_name=credit_status["provider_name"],
-                provider_link=u'<a href="{provider_url}">{provider_name}</a>'.format(
-                    provider_url=credit_status["provider_status_url"],
-                    provider_name=credit_status["provider_name"],
+            ${_("Your credit has been processed but denied. Please contact {link} for more information.").format(
+                    link=provider_link,
                 )
-            )
-        }
+            }
         </p>
-        <a class="btn credit-btn" href="${credit_status['provider_status_url']}" target="_blank">
-            ${_("Contact {provider_link}").format(provider_link=u'<a href="{provider_url}">{provider_name}</a>'.format(
-                provider_url=credit_status["provider_status_url"],
-                provider_name=credit_status["provider_name"],
-            )
-            )
+        <a class="btn credit-btn denied-credit-btn" href="${credit_status['provider_status_url']}" target="_blank">
+            ${_("Contact {provider}").format(provider=u'credit_status["provider_name"]')
         }
         </a>
     % endif

From 08165e8823ef106836cae983fc7e435abcadb04f Mon Sep 17 00:00:00 2001
From: Ahsan Ulhaq <ahsan.haq@arbisoft.com>
Date: Thu, 30 Jul 2015 14:35:11 +0500
Subject: [PATCH 2/2] Update ICRV version

---
 requirements/edx/github.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt
index b4660fadac..f6fa888f96 100644
--- a/requirements/edx/github.txt
+++ b/requirements/edx/github.txt
@@ -53,7 +53,7 @@ git+https://github.com/edx/edx-oauth2-provider.git@0.5.6#egg=oauth2-provider==0.
 git+https://github.com/edx/edx-lint.git@ed8c8d2a0267d4d42f43642d193e25f8bd575d9b#egg=edx_lint==0.2.3
 -e git+https://github.com/edx/xblock-utils.git@213a97a50276d6a2504d8133650b2930ead357a0#egg=xblock-utils
 -e git+https://github.com/edx-solutions/xblock-google-drive.git@138e6fa0bf3a2013e904a085b9fed77dab7f3f21#egg=xblock-google-drive
--e git+https://github.com/edx/edx-reverification-block.git@a286e89c73e1b788e35ac5b08a54b71a9fa63cfd#egg=edx-reverification-block
+-e git+https://github.com/edx/edx-reverification-block.git@485c189f4c5d9ad34e8856e385be546c0ad0a9aa#egg=edx-reverification-block
 git+https://github.com/edx/ecommerce-api-client.git@1.1.0#egg=ecommerce-api-client==1.1.0
 -e git+https://github.com/edx/edx-user-state-client.git@64a8b603f42669bb7fdca03d364d4e8d3d6ad67d#egg=edx-user-state-client