From 258660edb7113d140042fad3140d514b089d050e Mon Sep 17 00:00:00 2001 From: Julian Maurice Date: Thu, 20 Feb 2014 23:56:04 +0100 Subject: [PATCH] Bug 11904: Example usage of new module Koha::Messages Test plan: 1/ Go to members/moremember.pl 2/ Click on "More" -> "Renew patron" and confirm 3/ A message should appear "Patron's account has been renewed until ..." 4/ In a shell, go to misc/translator and run ./translate create fr-FR (or ./translate update fr-FR) ./translate install fr-FR (you can use your own language of course) 5/ Edit po/fr-FR-messages.po and translate the string "Patron's account has been renewed until ..." 6/ In staff interface change language to French and renew patron once again. 7/ The translated message should appear. --- circ/circulation.pl | 3 ++- .../prog/en/modules/circ/circulation.tt | 3 +-- .../prog/en/modules/members/moremember-brief.tt | 6 +----- .../prog/en/modules/members/moremember.tt | 9 ++------- members/moremember.pl | 1 - members/setstatus.pl | 22 +++++++++++----------- 6 files changed, 17 insertions(+), 27 deletions(-) diff --git a/circ/circulation.pl b/circ/circulation.pl index e789370..828a7f3 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -613,7 +613,6 @@ $template->param( branchname => GetBranchName($borrower->{'branchcode'}), printer => $printer, printername => $printer, - was_renewed => $query->param('was_renewed') ? 1 : 0, expiry => $borrower->{'dateexpiry'}, roadtype => $roadtype, amountold => $amountold, @@ -638,6 +637,8 @@ $template->param( relatives_borrowernumbers => \@relatives, ); +$session->flush; + my $patron_image = Koha::Patron::Images->find($borrower->{borrowernumber}); $template->param( picture => 1 ) if $patron_image; 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 c4b41f3..b9dc49c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -152,6 +152,7 @@ $(document).ready(function() { [% IF ( borrowernumber ) %] [% INCLUDE 'members-toolbar.inc' %] [% END %] +[% INCLUDE 'messages.inc' %] -[% IF ( was_renewed ) %]
Patron's account has been renewed until [% expiry | $KohaDates %]
[% END %] - [% IF additional_materials %]
Note about the accompanying materials:
[% additional_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 34367d8..673bb51 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 @@ -73,11 +73,7 @@
  • Category: [% description %] ([% categorycode %])
  • Registration date: [% dateenrolled | $KohaDates %]
  • Expiration date: - [% IF ( was_renewed ) %] - [% dateexpiry | $KohaDates %] - [% ELSE %] - [% dateexpiry | $KohaDates %] - [% END %] + [% dateexpiry | $KohaDates %]
  • Library: [% branchname %]
  • 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 a9ce12a..f4ee9f0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -164,12 +164,11 @@ function validate1(date) {
    [% END %]
    + [% INCLUDE 'messages.inc' %] [% IF ( unknowuser ) %]
    This patron does not exist.
    [% ELSE %] - [% IF ( was_renewed ) %]
    Patron's account has been renewed until [% dateexpiry | $KohaDates %]
    [% END %] - [% IF ( flagged ) %]
      @@ -342,11 +341,7 @@ function validate1(date) {
    • Registration date: [% dateenrolled | $KohaDates %]
    • Expiration date: - [% IF ( was_renewed ) %] - [% dateexpiry | $KohaDates %] - [% ELSE %] - [% dateexpiry | $KohaDates %] - [% END %] + [% dateexpiry | $KohaDates %]
    • Library: [% branchname %]
    • diff --git a/members/moremember.pl b/members/moremember.pl index ba4c0a5..b9d2cd5 100755 --- a/members/moremember.pl +++ b/members/moremember.pl @@ -340,7 +340,6 @@ $template->param( borrowernumber => $borrowernumber, othernames => $data->{'othernames'}, categoryname => $data->{'description'}, - was_renewed => $input->param('was_renewed') ? 1 : 0, branch => $branch, todaysdate => output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }), totalprice => sprintf("%.2f", $totalprice), diff --git a/members/setstatus.pl b/members/setstatus.pl index 69849aa..5ef4b6b 100755 --- a/members/setstatus.pl +++ b/members/setstatus.pl @@ -31,6 +31,9 @@ use C4::Context; use C4::Members; use C4::Auth; +use Koha::I18N; +use Koha::Messages; +use Koha::DateUtils; my $input = new CGI; @@ -53,16 +56,13 @@ if ( $reregistration eq 'y' ) { $sth->finish; } -if($destination eq "circ"){ - if($dateexpiry){ - print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber&was_renewed=1"); - } else { - print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber"); - } +if ($dateexpiry) { + $dateexpiry = output_pref({dt => dt_from_string($dateexpiry, 'iso'), dateonly => 1}); + messages_set(gettext("Patron's account has been renewed until %1", $dateexpiry)); +} + +if ($destination eq "circ") { + print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber"); } else { - if($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"); - } + print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber"); } -- 1.9.1