@@ -, +, @@ - Before applying the patch, renew a patron from the patron details page and verify that you don't see the renewal confirmation. - After applying the patch, renew the patron from the details page and verify that the "Patron's account has been renewed until XXX" message shows up. - Renew the patron from the checkout page and verify that the confirmation message shows up. --- circ/circulation.pl | 3 +-- .../prog/en/includes/members-toolbar.inc | 2 +- .../prog/en/modules/circ/circulation.tt | 2 +- .../prog/en/modules/members/moremember-brief.tt | 2 +- .../prog/en/modules/members/moremember.tt | 4 ++-- members/moremember.pl | 8 +------- members/setstatus.pl | 4 ++-- 7 files changed, 9 insertions(+), 16 deletions(-) --- a/circ/circulation.pl +++ a/circ/circulation.pl @@ -132,7 +132,6 @@ my $issueconfirmed = $query->param('issueconfirmed'); my $cancelreserve = $query->param('cancelreserve'); my $organisation = $query->param('organisations'); my $print = $query->param('print') || q{}; -my $newexpiry = $query->param('dateexpiry'); my $debt_confirmed = $query->param('debt_confirmed') || 0; # Don't show the debt error dialog twice # Check if stickyduedate is turned off @@ -676,7 +675,7 @@ $template->param( surname => $borrower->{'surname'}, showname => $borrower->{'showname'}, category_type => $borrower->{'category_type'}, - dateexpiry => format_date($newexpiry), + was_renewed => $query->param('was_renewed') ? 1 : 0, expiry => format_date($borrower->{'dateexpiry'}), categorycode => $borrower->{'categorycode'}, categoryname => $borrower->{description}, --- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc @@ -125,7 +125,7 @@ function export_barcodes() {
  • Print summary
  • Print slip
  • Search to hold
  • - [% IF ( CAN_user_borrowers ) %]
  • Renew account
  • [% END %] + [% IF ( CAN_user_borrowers ) %]
  • Renew patron
  • [% END %] [% IF ( CAN_user_permissions ) %] [% IF ( CAN_user_staffaccess ) %]
  • Set permissions
  • --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -303,7 +303,7 @@ function validate1(date) { -[% IF ( dateexpiry ) %]
    Patron's account has been renewed until [% dateexpiry %]
    [% END %] +[% IF ( was_renewed ) %]
    Patron's account has been renewed until [% expiry %]
    [% END %] [% IF additional_materials %]
    Note about the accompanying materials:
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt @@ -76,7 +76,7 @@
  • Category: [% description %] ([% categorycode %])
  • Registration date: [% dateenrolled %]
  • Expiration date: - [% IF ( reregistration ) %] + [% IF ( was_renewed ) %] [% dateexpiry %] [% ELSE %] [% dateexpiry %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -168,7 +168,7 @@ function validate1(date) { [% IF ( unknowuser ) %]
    This patron does not exist.
    [% ELSE %] - [% IF ( reregistration ) %]
    Patron's account has been renewed until [% dateexpiry %]
    [% END %] + [% IF ( was_renewed ) %]
    Patron's account has been renewed until [% dateexpiry %]
    [% END %] [% IF ( flagged ) %]