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(){
    [% IF ( CAN_user_borrowers ) %] -
  • Renew patron
    • +
  • Renew patron
    • [% ELSE %]
  • Renew patron
    • [% END %] 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 19b5bd75f3..82fcdf8fdb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -291,7 +291,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:
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt index d983996026..c9fb845fef 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt +++ b/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 %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index 868334f450..b3eef3a8ee 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -181,7 +181,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 ) %]
    @@ -358,7 +358,7 @@ function validate1(date) {
  • Registration date: [% dateenrolled %]
  • Expiration date: - [% IF ( reregistration ) %] + [% IF ( was_renewed ) %] [% dateexpiry %] [% ELSE %] [% dateexpiry %] diff --git a/members/moremember.pl b/members/moremember.pl index fe3b2eb240..e6f80dd48e 100755 --- a/members/moremember.pl +++ b/members/moremember.pl @@ -118,7 +118,6 @@ my $borrowernumber = $input->param('borrowernumber'); #start the page and read in includes my $data = GetMember( 'borrowernumber' => $borrowernumber ); -my $reregistration = $input->param('reregistration'); if ( not defined $data ) { $template->param (unknowuser => 1); @@ -126,11 +125,6 @@ if ( not defined $data ) { exit; } -# re-reregistration function to automatic calcul of date expiry -if ( $reregistration eq 'y' ) { - $data->{'dateexpiry'} = ExtendMemberSubscriptionTo( $borrowernumber ); -} - my $category_type = $data->{'category_type'}; ### $category_type @@ -412,7 +406,7 @@ $template->param( borrowernumber => $borrowernumber, othernames => $data->{'othernames'}, categoryname => $data->{'description'}, - reregistration => $reregistration, + was_renewed => $input->param('was_renewed') ? 1 : 0, branch => $branch, todaysdate => C4::Dates->today(), totalprice => sprintf("%.2f", $totalprice), diff --git a/members/setstatus.pl b/members/setstatus.pl index a6a35aa83d..2c13401abc 100755 --- a/members/setstatus.pl +++ b/members/setstatus.pl @@ -56,13 +56,13 @@ if ( $reregistration eq 'y' ) { if($destination eq "circ"){ if($dateexpiry){ - print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$cardnumber&dateexpiry=$dateexpiry"); + print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$cardnumber&was_renewed=1"); } else { print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$cardnumber"); } } else { if($dateexpiry){ - print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber&dateexpiry=$dateexpiry"); + print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber&was_renewed=1"); } else { print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber"); } -- 2.39.5