From d1d163a1d07a02232c98e207ddc897b69f4ddfd0 Mon Sep 17 00:00:00 2001 From: Henri-Damien LAURENT Date: Fri, 26 Feb 2010 16:06:35 +0100 Subject: [PATCH] Fix for Bug 6671 - Change name of variable used when renewing patron expiration Content-Type: text/plain; charset="utf-8" Edit by Owen Leonard: Pulling changes from Bug 5436, I see a couple of changes related to patron renewal. These changes seem to simply rename a variable in the script and the template. I can't tell if it changes are fixing any bug or not. --- circ/circulation.pl | 4 ++-- .../prog/en/modules/circ/circulation.tt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/circ/circulation.pl b/circ/circulation.pl index c34db54..1bb7b72 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -644,8 +644,8 @@ $template->param( printername => $printer, firstname => $borrower->{'firstname'}, surname => $borrower->{'surname'}, - dateexpiry => format_date($newexpiry), - expiry => format_date($borrower->{'dateexpiry'}), + newexpiry => format_date($newexpiry), + expiry => format_date($borrower->{'newexpiry'}), categorycode => $borrower->{'categorycode'}, categoryname => $borrower->{description}, address => $address, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 4d2459b..caaa665 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -225,7 +225,7 @@ function refocus(calendar) { -[% IF ( dateexpiry ) %]
Patron's account has been renewed until [% dateexpiry %]
[% END %] +[% IF ( newexpiry ) %]
Patron's account has been renewed until [% newexpiry %]
[% END %] [% IF ( NEEDSCONFIRMATION ) %]
-- 1.7.3