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

(-)a/circ/circulation.pl (-1 / +1 lines)
Lines 514-520 $template->param( Link Here
514
    surname           => $borrower->{'surname'},
514
    surname           => $borrower->{'surname'},
515
    showname          => $borrower->{'showname'},
515
    showname          => $borrower->{'showname'},
516
    category_type     => $borrower->{'category_type'},
516
    category_type     => $borrower->{'category_type'},
517
    was_renewed       => $query->param('was_renewed') ? 1 : 0,
518
    expiry            => format_date($borrower->{'dateexpiry'}),
517
    expiry            => format_date($borrower->{'dateexpiry'}),
519
    categorycode      => $borrower->{'categorycode'},
518
    categorycode      => $borrower->{'categorycode'},
520
    categoryname      => $borrower->{description},
519
    categoryname      => $borrower->{description},
Lines 557-562 $template->param( Link Here
557
if ($stickyduedate) {
556
if ($stickyduedate) {
558
    $session->param( 'stickyduedate', $duedatespec );
557
    $session->param( 'stickyduedate', $duedatespec );
559
}
558
}
559
$session->flush;
560
560
561
my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'});
561
my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'});
562
$template->param( picture => 1 ) if $picture;
562
$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 85-90 $(document).ready(function() { Link Here
85
[% IF ( borrowernumber ) %]
85
[% IF ( borrowernumber ) %]
86
[% INCLUDE 'members-toolbar.inc' %]
86
[% INCLUDE 'members-toolbar.inc' %]
87
[% END %]
87
[% END %]
88
[% INCLUDE 'messages.inc' %]
88
89
89
<!--  INITIAL BLOC : PARAMETERS & BORROWER INFO -->
90
<!--  INITIAL BLOC : PARAMETERS & BORROWER INFO -->
90
<div style="display: none;" id="add_message_form">
91
<div style="display: none;" id="add_message_form">
Lines 124-131 $(document).ready(function() { Link Here
124
</form>
125
</form>
125
</div>
126
</div>
126
127
127
[% IF ( was_renewed ) %]<div class="dialog message">Patron's account has been renewed until [% expiry %]</div>[% END %]
128
129
[% IF additional_materials %]
128
[% IF additional_materials %]
130
    <div id="materials" class="dialog message">Note about the accompanying materials: <br />
129
    <div id="materials" class="dialog message">Note about the accompanying materials: <br />
131
    [% additional_materials %]
130
    [% 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 149-160 function validate1(date) { Link Here
149
</div>
149
</div>
150
[% END %]
150
[% END %]
151
<div class="yui-g">
151
<div class="yui-g">
152
  [% INCLUDE 'messages.inc' %]
152
153
153
[% IF ( unknowuser ) %]
154
[% IF ( unknowuser ) %]
154
   <div class="dialog message">This patron does not exist.</div>
155
   <div class="dialog message">This patron does not exist.</div>
155
[% ELSE %]
156
[% ELSE %]
156
    [% IF ( was_renewed ) %]<div class="dialog message">Patron's account has been renewed until [% dateexpiry %]</div>[% END %]
157
158
    [% IF ( flagged ) %]
157
    [% IF ( flagged ) %]
159
    <div id="circmessages" class="circmessage attention">
158
    <div id="circmessages" class="circmessage attention">
160
        <ul>
159
        <ul>
Lines 324-334 function validate1(date) { Link Here
324
    <li><span class="label">Registration date: </span>[% dateenrolled %]</li>
323
    <li><span class="label">Registration date: </span>[% dateenrolled %]</li>
325
    
324
    
326
    <li><span class="label">Expiration date: </span>
325
    <li><span class="label">Expiration date: </span>
327
    [% IF ( was_renewed ) %]
326
        [% dateexpiry %]
328
            <strong class="reregistrinfo">[% dateexpiry %]</strong>
329
    [% ELSE %]
330
            [% dateexpiry %]
331
    [% END %]
332
    </li>
327
    </li>
333
    
328
    
334
    <li><span class="label">Library: </span>[% branchname %]</li>
329
    <li><span class="label">Library: </span>[% branchname %]</li>
(-)a/members/moremember.pl (-1 lines)
Lines 351-357 $template->param( Link Here
351
    borrowernumber  => $borrowernumber,
351
    borrowernumber  => $borrowernumber,
352
    othernames      => $data->{'othernames'},
352
    othernames      => $data->{'othernames'},
353
    categoryname    => $data->{'description'},
353
    categoryname    => $data->{'description'},
354
    was_renewed     => $input->param('was_renewed') ? 1 : 0,
355
    branch          => $branch,
354
    branch          => $branch,
356
    todaysdate      => C4::Dates->today(),
355
    todaysdate      => C4::Dates->today(),
357
    totalprice      => sprintf("%.2f", $totalprice),
356
    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