@@ -, +, @@
./translate create fr-FR (or ./translate update fr-FR)
./translate install fr-FR
(you can use your own language of course)
has been renewed until ..."
---
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(-)
--- a/circ/circulation.pl
+++ a/circ/circulation.pl
@@ -600,7 +600,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,
@@ -625,6 +624,8 @@ $template->param(
relatives_borrowernumbers => \@relatives,
);
+$session->flush;
+
my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'});
$template->param( picture => 1 ) if $picture;
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ a/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' %]
@@ -191,8 +192,6 @@ $(document).ready(function() {
-[% IF ( was_renewed ) %]Patron's account has been renewed until [% expiry | $KohaDates %]
[% END %]
-
[% IF additional_materials %]
Note about the accompanying materials:
[% additional_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
@@ -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 %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ a/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 %]
--- a/members/moremember.pl
+++ a/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),
--- a/members/setstatus.pl
+++ a/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");
}
--