[open-ils-commits] [GIT] Evergreen ILS branch master updated. c6a5404e6418abb7b4c58822cf292348a07cc461

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  c6a5404e6418abb7b4c58822cf292348a07cc461 (commit)
       via  86f6a4bc19af2e6ba521db6646036d3369b1adab (commit)
      from  677370554b9be79353ca2f599784dd617c42af73 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c6a5404e6418abb7b4c58822cf292348a07cc461
Author: Ben Shum <bshum at biblio.org>
Date:   Tue Jul 28 16:49:23 2015 -0400

    LP#1454879: Release notes for Account Expiration Date in OPAC
    
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/docs/RELEASE_NOTES_NEXT/OPAC/account-expiration-in-my-account.txt b/docs/RELEASE_NOTES_NEXT/OPAC/account-expiration-in-my-account.txt
new file mode 100644
index 0000000..cd5fbc9
--- /dev/null
+++ b/docs/RELEASE_NOTES_NEXT/OPAC/account-expiration-in-my-account.txt
@@ -0,0 +1,7 @@
+Account Expiration Date in My Account
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+The Account Expiration Date has been added to the catalog's My Account display
+on the main Account Summary page and the Account Preferences page.  This should
+help patrons with figuring out when their accounts are due to expire before
+they actually expire.
+

commit 86f6a4bc19af2e6ba521db6646036d3369b1adab
Author: Terran McCanna <tmccanna at georgialibraries.org>
Date:   Fri May 15 10:18:15 2015 -0700

    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 at georgialibraries.org>
    Signed-off-by: Josh Stompro <stomproj at larl.org>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/templates/opac/myopac/prefs.tt2 b/Open-ILS/src/templates/opac/myopac/prefs.tt2
index a8e1d19..f2462a5 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 86f3488..bf84e80 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') %]"

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/templates/opac/myopac/prefs.tt2       |   12 ++++++++++++
 .../src/templates/opac/parts/myopac/main_base.tt2  |    6 ++++++
 .../OPAC/account-expiration-in-my-account.txt      |    7 +++++++
 3 files changed, 25 insertions(+), 0 deletions(-)
 create mode 100644 docs/RELEASE_NOTES_NEXT/OPAC/account-expiration-in-my-account.txt


hooks/post-receive
-- 
Evergreen ILS