From 259163d1d733b76357aa0ac9e6e56aa892b83293 Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Wed, 16 Jan 2013 09:38:28 -0800 Subject: [PATCH] Bug 9406: ensure confirmation of patron renewal is displayed When renewing a patron from the patron details page, ensure that the "Patron's account has been renewed until XXX" is actually displayed. This patch introduces a was_renewed CGI and template parameter to clarify the intent of the relevent template sections. To test: - 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. Signed-off-by: Galen Charlton Signed-off-by: Jonathan Druart Signed-off-by: Katrin Fischer Message now displays for both tabs. Fixed tab to make QA script pass. Signed-off-by: Jared Camins-Esakov --- circ/circulation.pl | 3 +-- .../intranet-tmpl/prog/en/includes/members-toolbar.inc | 2 +- .../intranet-tmpl/prog/en/modules/circ/circulation.tt | 2 +- .../prog/en/modules/members/moremember-brief.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/moremember.tt | 4 ++-- members/moremember.pl | 8 +------- members/setstatus.pl | 4 ++-- 7 files changed, 9 insertions(+), 16 deletions(-) diff --git a/circ/circulation.pl b/circ/circulation.pl index f8a11c4f9d..7ca62f20ac 100755 --- a/circ/circulation.pl +++ b/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 my $charges = $query->param('charges') || q{}; @@ -682,7 +681,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}, diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc index 3bdcec8efc..787b852161 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc @@ -131,7 +131,7 @@ function searchToHold(){