@@ -, +, @@
- Followup 4
- opac-reserve.tt : opening
instead of closing
- opac-user.tt : warnexpired was in database format, adds the use of KohaDates template plugin
- opac-user.tt : duplicated TT test : [% IF ( BORROWER_INF.warnexpired ) %] and [% ELSIF ( BORROWER_INF.warnexpired ) %], maybe a merge error
- opac-user.tt : instead of , maybe for HTML 6 :-)
- opac-user.pl : adding dateformat var to template is already done by Auth.pm
---
C4/Members.pm | 1 +
koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt | 2 +-
koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt | 8 ++------
opac/opac-user.pl | 1 -
4 files changed, 4 insertions(+), 8 deletions(-)
--- a/C4/Members.pm
+++ a/C4/Members.pm
@@ -355,6 +355,7 @@ sub GetMemberDetails {
return;
}
my $borrower = $sth->fetchrow_hashref;
+ return unless $borrower;
my ($amount) = GetMemberAccountRecords( $borrowernumber);
$borrower->{'amountoutstanding'} = $amount;
# FIXME - patronflags calls GetMemberAccountRecords... just have patronflags return $amount
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
+++ a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
@@ -231,7 +231,7 @@
ERROR: Internal error: incomplete hold request.
[% END %]
[% IF ( expired_patron ) %]
- Sorry, you cannot place holds because your library card has expired.
Please contact your librarian if you wish to renew your card
+ Sorry, you cannot place holds because your library card has expired.
Please contact your librarian if you wish to renew your card
[% END %]
[% ELSE %]
[% IF ( none_available ) %]
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
+++ a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
@@ -100,17 +100,13 @@ var MSG_CONFIRM_RESUME_HOLDS = _("Are you sure you want to resume all suspended
[% IF ( BORROWER_INF.warnexpired ) %]
- Please note: Your account has expired. Please contact the library for more information.
-
- [% ELSIF ( BORROWER_INF.warnexpired ) %]
-
- Please note: You account has expired as of [% BORROWER_INF.warnexpired %]. Please contact the library if you wish to renew your account.
+ Please note: You account has expired as of [% BORROWER_INF.warnexpired | $KohaDates %]. Please contact the library if you wish to renew your account.
[% END %]
[% IF ( RENEW_ERROR ) %]
- Please note:
+ Please note:
Your account renewal failed because of the following:
[% FOREACH error IN RENEW_ERROR.split('\|') %]
--- a/opac/opac-user.pl
+++ a/opac/opac-user.pl
@@ -358,7 +358,6 @@ $template->param(
patronupdate => $patronupdate,
OpacRenewalAllowed => C4::Context->preference("OpacRenewalAllowed"),
userview => 1,
- dateformat => C4::Context->preference("dateformat"),
);
$template->param(
--