From 86f6a4bc19af2e6ba521db6646036d3369b1adab Mon Sep 17 00:00:00 2001
From: Terran McCanna <tmccanna@georgialibraries.org>
Date: Fri, 15 May 2015 10:18:15 -0700
Subject: [PATCH] LP1454879: Add Account Expiration Date to OPAC

Added Account Expiration Date to OPAC My Account display on
Account Summary page and Account Preferences page. This is in
response to patron requests to know when their accounts will
expire before the point at which they actually expire.

To test, log into My Account through the OPAC - a new table row
with account expiration date should appear on the main account
summary page, and another new row should appear on the main
account preferences page.

Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Signed-off-by: Josh Stompro <stomproj@larl.org>
Signed-off-by: Ben Shum <bshum@biblio.org>
---
 Open-ILS/src/templates/opac/myopac/prefs.tt2           | 12 ++++++++++++
 Open-ILS/src/templates/opac/parts/myopac/main_base.tt2 |  6 ++++++
 2 files changed, 18 insertions(+)

diff --git a/Open-ILS/src/templates/opac/myopac/prefs.tt2 b/Open-ILS/src/templates/opac/myopac/prefs.tt2
index a8e1d19a20..f2462a5d6b 100644
--- a/Open-ILS/src/templates/opac/myopac/prefs.tt2
+++ b/Open-ILS/src/templates/opac/myopac/prefs.tt2
@@ -106,6 +106,18 @@
                 <td class='light_border'>[% date.format(ctx.parse_datetime(ctx.user.create_date), DATE_FORMAT) %]</td>
                 <td></td>
             </tr>
+            <tr>
+                <td class='color_4 light_border'>[% l("Account Expiration Date") %]</td>
+                <td class='light_border'>
+                    [%- IF date.format(ctx.parse_datetime(ctx.user.expire_date), '%s') < date.format(date.now , '%s'); -%]
+                        <span class="alert" style="font-weight:bold;">[% date.format(ctx.parse_datetime(ctx.user.expire_date), DATE_FORMAT) %]</span>
+                        </td>
+                    [% ELSE %]
+                        [% date.format(ctx.parse_datetime(ctx.user.expire_date), DATE_FORMAT) %]
+                    [% END %]
+                </td>
+                <td></td>
+            </tr>
         </tbody>
     </table><br />
     <hr class='opac-auto-013' color="#DCDBDB" />
diff --git a/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2 b/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
index 86f34887a1..bf84e80294 100644
--- a/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
+++ b/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
@@ -39,6 +39,12 @@
             </div>
             <table class="acct_sum_table" title="[% l('Account Summary') %]">
                 <tr>
+                    <td>[% l("Account Expiration Date") %]</td>
+                    <td align="right">
+                        [% date.format(ctx.parse_datetime(ctx.user.expire_date), DATE_FORMAT) %]
+                    </td>
+                </tr>
+                <tr>
                     <td>[% l("Items Currently Checked out ([_1])", ctx.user_stats.checkouts.total_out) %]</td>
                     <td align="right">
                         <a href="[% mkurl(ctx.opac_root _ '/myopac/circs') %]"
-- 
2.11.0