show the departure date if close or past

Signed-off-by: Chris Cormack <crc@liblime.com>

diff --git a/circ/circulation.pl b/circ/circulation.pl
index f6711f3..6d4f60b 100755 (executable)
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -182,7 +182,7 @@ if ($borrowernumber) {
         #borrowercard expired or nearly expired, warn the librarian
         $template->param(
             flagged       => "1",
-            warndeparture => "1",
+            warndeparture => format_date("$warning_year-$warning_month-$warning_day"),
             renewaldate   => "$renew_year-$renew_month-$renew_day"
         );
     }

diff --git a/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl
index 911f2cc..11dbd0e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl
@@ -27,7 +27,7 @@
             <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->">details</a>
                 / <a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;modify=edit&amp;destination=circ&categorycode=<!-- TMPL_VAR name="categorycode" -->">edit</a>
         <p>
-        <!--TMPL_IF Name="warndeparture"--><p class="problem"> Patron will leave soon.</p><!--/TMPL_IF-->
+        <!--TMPL_IF Name="warndeparture"--><p class="problem"> Patron card expires on <!-- TMPL_VAR name="warndeparture" -->.</p><!--/TMPL_IF-->
         <!-- TMPL_IF NAME="streetaddress"-->
             <!-- TMPL_VAR NAME="streetaddress" -->,
         <!-- TMPL_ELSE -->