@@ -, +, @@
Koha::Messages
./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 | 2 +-
.../prog/en/includes/members-toolbar.inc | 2 +-
.../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 | 19 +++++++++----------
7 files changed, 15 insertions(+), 27 deletions(-)
--- a/circ/circulation.pl
+++ a/circ/circulation.pl
@@ -521,7 +521,6 @@ $template->param(
surname => $borrower->{'surname'},
showname => $borrower->{'showname'},
category_type => $borrower->{'category_type'},
- was_renewed => $query->param('was_renewed') ? 1 : 0,
expiry => format_date($borrower->{'dateexpiry'}),
categorycode => $borrower->{'categorycode'},
categoryname => $borrower->{description},
@@ -562,6 +561,7 @@ $template->param(
if ($stickyduedate) {
$session->param( 'stickyduedate', $duedatespec );
}
+$session->flush;
my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'});
$template->param( picture => 1 ) if $picture;
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
@@ -69,7 +69,7 @@ function update_child() {
function confirm_reregistration() {
var is_confirmed = window.confirm(_("Are you sure you want to renew this patron's registration?"));
if (is_confirmed) {
- window.location = '/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% borrowernumber %]&cardnumber=[% cardnumber %]&desintation=[% destination %]&reregistration=y';
+ window.location = '/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% borrowernumber %]&cardnumber=[% cardnumber %]&destination=[% destination %]&reregistration=y';
}
}
function export_barcodes() {
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -85,6 +85,7 @@ $(document).ready(function() {
[% IF ( borrowernumber ) %]
[% INCLUDE 'members-toolbar.inc' %]
[% END %]
+[% INCLUDE 'messages.inc' %]
@@ -124,8 +125,6 @@ $(document).ready(function() {
-[% IF ( was_renewed ) %]Patron's account has been renewed until [% expiry %]
[% 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
@@ -76,11 +76,7 @@
Category: [% description %] ([% categorycode %])
Registration date: [% dateenrolled %]
Expiration date:
- [% IF ( was_renewed ) %]
- [% dateexpiry %]
- [% ELSE %]
- [% dateexpiry %]
- [% END %]
+ [% dateexpiry %]
Library: [% branchname %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -149,12 +149,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 %]
[% END %]
-
[% IF ( flagged ) %]
@@ -325,11 +324,7 @@ function validate1(date) {
- Registration date: [% dateenrolled %]
- Expiration date:
- [% IF ( was_renewed ) %]
- [% dateexpiry %]
- [% ELSE %]
- [% dateexpiry %]
- [% END %]
+ [% dateexpiry %]
- Library: [% branchname %]
--- a/members/moremember.pl
+++ a/members/moremember.pl
@@ -348,7 +348,6 @@ $template->param(
borrowernumber => $borrowernumber,
othernames => $data->{'othernames'},
categoryname => $data->{'description'},
- was_renewed => $input->param('was_renewed') ? 1 : 0,
branch => $branch,
todaysdate => C4::Dates->today(),
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;
@@ -54,16 +57,12 @@ if ( $reregistration eq 'y' ) {
$sth->finish;
}
+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"){
- if($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");
- }
+ 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&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");
}
--