Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'bug_9406' into 3.12-master

Browse source
This commit is contained in:
Jared Camins-Esakov 2013-03-30 21:22:03 -04:00
commit 91e09b98d2
7 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
circ/circulation.pl
View file

@ -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},

2
koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
View file

@ -131,7 +131,7 @@ function searchToHold(){
<button class="btn btn-small dropdown-toggle" data-toggle="dropdown">More <span class="caret"></span></button>
<ul class="dropdown-menu">
[% IF ( CAN_user_borrowers ) %]
<li><a id="renewpatron" href="/cgi-bin/koha/members/moremember.pl?reregistration=y&amp;borrowernumber=[% borrowernumber %]">Renew patron</a></li>
<li><a id="renewpatron" href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% borrowernumber %]&amp;cardnumber=[% cardnumber %]&amp;destination=[% destination %]&amp;reregistration=y">Renew patron</a></li>
[% ELSE %]
<li class="disabled"><a id="renewpatron" href="#">Renew patron</a></li>
[% END %]

2
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
View file

@ -291,7 +291,7 @@ function validate1(date) {
</form>
</div>
[% IF ( dateexpiry ) %]<div class="dialog message">Patron's account has been renewed until [% dateexpiry %]</div>[% END %]
[% IF ( was_renewed ) %]<div class="dialog message">Patron's account has been renewed until [% expiry %]</div>[% END %]
[% IF additional_materials %]
<div id="materials" class="dialog message">Note about the accompanying materials: <br />

2
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
View file

@ -76,7 +76,7 @@
<li><span class="label">Category: </span>[% description %] ([% categorycode %])</li>
<li><span class="label">Registration date: </span>[% dateenrolled %]</li>
<li><span class="label">Expiration date: </span>
[% IF ( reregistration ) %]
[% IF ( was_renewed ) %]
<strong class="reregistrinfo">[% dateexpiry %]</strong>
[% ELSE %]
[% dateexpiry %]

4
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
View file

@ -181,7 +181,7 @@ function validate1(date) {
[% IF ( unknowuser ) %]
<div class="dialog message">This patron does not exist.</div>
[% ELSE %]
[% IF ( reregistration ) %]<div class="dialog message">Patron's account has been renewed until [% dateexpiry %]</div>[% END %]
[% IF ( was_renewed ) %]<div class="dialog message">Patron's account has been renewed until [% dateexpiry %]</div>[% END %]
[% IF ( flagged ) %]
<div id="circmessages" class="circmessage attention">
@ -358,7 +358,7 @@ function validate1(date) {
<li><span class="label">Registration date: </span>[% dateenrolled %]</li>
<li><span class="label">Expiration date: </span>
[% IF ( reregistration ) %]
[% IF ( was_renewed ) %]
<strong class="reregistrinfo">[% dateexpiry %]</strong>
[% ELSE %]
[% dateexpiry %]

8
members/moremember.pl
View file

@ -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),

4
members/setstatus.pl
View file

@ -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");
}