View | Details | Raw Unified | Return to bug 11904
Collapse All | Expand All

(-)a/circ/circulation.pl (-1 / +1 lines)
Lines 717-723 $template->param( Link Here
717
    surname           => $borrower->{'surname'},
717
    surname           => $borrower->{'surname'},
718
    showname          => $borrower->{'showname'},
718
    showname          => $borrower->{'showname'},
719
    category_type     => $borrower->{'category_type'},
719
    category_type     => $borrower->{'category_type'},
720
    was_renewed       => $query->param('was_renewed') ? 1 : 0,
721
    expiry            => format_date($borrower->{'dateexpiry'}),
720
    expiry            => format_date($borrower->{'dateexpiry'}),
722
    categorycode      => $borrower->{'categorycode'},
721
    categorycode      => $borrower->{'categorycode'},
723
    categoryname      => $borrower->{description},
722
    categoryname      => $borrower->{description},
Lines 764-769 $template->param( Link Here
764
if ($stickyduedate) {
763
if ($stickyduedate) {
765
    $session->param( 'stickyduedate', $duedatespec );
764
    $session->param( 'stickyduedate', $duedatespec );
766
}
765
}
766
$session->flush;
767
767
768
my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'});
768
my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'});
769
$template->param( picture => 1 ) if $picture;
769
$template->param( picture => 1 ) if $picture;
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc (-1 / +1 lines)
Lines 69-75 function update_child() { Link Here
69
function confirm_reregistration() {
69
function confirm_reregistration() {
70
    var is_confirmed = window.confirm(_("Are you sure you want to renew this patron's registration?"));
70
    var is_confirmed = window.confirm(_("Are you sure you want to renew this patron's registration?"));
71
    if (is_confirmed) {
71
    if (is_confirmed) {
72
    window.location = '/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% borrowernumber %]&cardnumber=[% cardnumber %]&desintation=[% destination %]&reregistration=y';
72
    window.location = '/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% borrowernumber %]&cardnumber=[% cardnumber %]&destination=[% destination %]&reregistration=y';
73
    }
73
    }
74
}
74
}
75
function export_barcodes() {
75
function export_barcodes() {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-2 / +1 lines)
Lines 127-132 var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export"); Link Here
127
[% IF ( borrowernumber ) %]
127
[% IF ( borrowernumber ) %]
128
[% INCLUDE 'members-toolbar.inc' %]
128
[% INCLUDE 'members-toolbar.inc' %]
129
[% END %]
129
[% END %]
130
[% INCLUDE 'messages.inc' %]
130
131
131
<!--  INITIAL BLOC : PARAMETERS & BORROWER INFO -->
132
<!--  INITIAL BLOC : PARAMETERS & BORROWER INFO -->
132
<div style="display: none;" id="add_message_form">
133
<div style="display: none;" id="add_message_form">
Lines 166-173 var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export"); Link Here
166
</form>
167
</form>
167
</div>
168
</div>
168
169
169
[% IF ( was_renewed ) %]<div class="dialog message">Patron's account has been renewed until [% expiry %]</div>[% END %]
170
171
[% IF additional_materials %]
170
[% IF additional_materials %]
172
    <div id="materials" class="dialog message">Note about the accompanying materials: <br />
171
    <div id="materials" class="dialog message">Note about the accompanying materials: <br />
173
    [% additional_materials %]
172
    [% additional_materials %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt (-5 / +1 lines)
Lines 76-86 Link Here
76
    <li><span class="label">Category: </span>[% description %] ([% categorycode %])</li>
76
    <li><span class="label">Category: </span>[% description %] ([% categorycode %])</li>
77
    <li><span class="label">Registration date: </span>[% dateenrolled %]</li>
77
    <li><span class="label">Registration date: </span>[% dateenrolled %]</li>
78
    <li><span class="label">Expiration date: </span>
78
    <li><span class="label">Expiration date: </span>
79
    [% IF ( was_renewed ) %]
79
        [% dateexpiry %]
80
            <strong class="reregistrinfo">[% dateexpiry %]</strong>
81
    [% ELSE %]
82
            [% dateexpiry %]
83
    [% END %]
84
    </li>
80
    </li>
85
    <li><span class="label">Library: </span>[% branchname %]</li>
81
    <li><span class="label">Library: </span>[% branchname %]</li>
86
82
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-7 / +2 lines)
Lines 182-193 function validate1(date) { Link Here
182
</div>
182
</div>
183
[% END %]
183
[% END %]
184
<div class="yui-g">
184
<div class="yui-g">
185
  [% INCLUDE 'messages.inc' %]
185
186
186
[% IF ( unknowuser ) %]
187
[% IF ( unknowuser ) %]
187
   <div class="dialog message">This patron does not exist.</div>
188
   <div class="dialog message">This patron does not exist.</div>
188
[% ELSE %]
189
[% ELSE %]
189
    [% IF ( was_renewed ) %]<div class="dialog message">Patron's account has been renewed until [% dateexpiry %]</div>[% END %]
190
191
    [% IF ( flagged ) %]
190
    [% IF ( flagged ) %]
192
    <div id="circmessages" class="circmessage attention">
191
    <div id="circmessages" class="circmessage attention">
193
        <ul>
192
        <ul>
Lines 358-368 function validate1(date) { Link Here
358
    <li><span class="label">Registration date: </span>[% dateenrolled %]</li>
357
    <li><span class="label">Registration date: </span>[% dateenrolled %]</li>
359
    
358
    
360
    <li><span class="label">Expiration date: </span>
359
    <li><span class="label">Expiration date: </span>
361
    [% IF ( was_renewed ) %]
360
        [% dateexpiry %]
362
            <strong class="reregistrinfo">[% dateexpiry %]</strong>
363
    [% ELSE %]
364
            [% dateexpiry %]
365
    [% END %]
366
    </li>
361
    </li>
367
    
362
    
368
    <li><span class="label">Library: </span>[% branchname %]</li>
363
    <li><span class="label">Library: </span>[% branchname %]</li>
(-)a/members/moremember.pl (-1 lines)
Lines 416-422 $template->param( Link Here
416
    borrowernumber  => $borrowernumber,
416
    borrowernumber  => $borrowernumber,
417
    othernames      => $data->{'othernames'},
417
    othernames      => $data->{'othernames'},
418
    categoryname    => $data->{'description'},
418
    categoryname    => $data->{'description'},
419
    was_renewed     => $input->param('was_renewed') ? 1 : 0,
420
    branch          => $branch,
419
    branch          => $branch,
421
    todaysdate      => C4::Dates->today(),
420
    todaysdate      => C4::Dates->today(),
422
    totalprice      => sprintf("%.2f", $totalprice),
421
    totalprice      => sprintf("%.2f", $totalprice),
(-)a/members/setstatus.pl (-11 / +9 lines)
Lines 31-36 use C4::Context; Link Here
31
use C4::Members;
31
use C4::Members;
32
use C4::Auth;
32
use C4::Auth;
33
33
34
use Koha::I18N;
35
use Koha::Messages;
36
use Koha::DateUtils;
34
37
35
my $input = new CGI;
38
my $input = new CGI;
36
39
Lines 54-69 if ( $reregistration eq 'y' ) { Link Here
54
	$sth->finish;
57
	$sth->finish;
55
	}
58
	}
56
59
60
if ($dateexpiry) {
61
    $dateexpiry = output_pref({dt => dt_from_string($dateexpiry, 'iso'), dateonly => 1});
62
    messages_set(gettext("Patron's account has been renewed until %1", $dateexpiry));
63
}
57
if($destination eq "circ"){
64
if($destination eq "circ"){
58
	if($dateexpiry){
65
    print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$cardnumber");
59
        print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$cardnumber&was_renewed=1");
60
	} else {
61
		print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$cardnumber");
62
	}
63
} else {
66
} else {
64
	if($dateexpiry){
67
    print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber");
65
        print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber&was_renewed=1");
66
	} else {
67
        print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber");
68
	}
69
}
68
}
70
- 

Return to bug 11904