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

(-)a/circ/circulation.pl (-1 / +2 lines)
Lines 600-606 $template->param( Link Here
600
    branchname        => GetBranchName($borrower->{'branchcode'}),
600
    branchname        => GetBranchName($borrower->{'branchcode'}),
601
    printer           => $printer,
601
    printer           => $printer,
602
    printername       => $printer,
602
    printername       => $printer,
603
    was_renewed       => $query->param('was_renewed') ? 1 : 0,
604
    expiry            => $borrower->{'dateexpiry'},
603
    expiry            => $borrower->{'dateexpiry'},
605
    roadtype          => $roadtype,
604
    roadtype          => $roadtype,
606
    amountold         => $amountold,
605
    amountold         => $amountold,
Lines 625-630 $template->param( Link Here
625
    relatives_borrowernumbers => \@relatives,
624
    relatives_borrowernumbers => \@relatives,
626
);
625
);
627
626
627
$session->flush;
628
628
my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'});
629
my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'});
629
$template->param( picture => 1 ) if $picture;
630
$template->param( picture => 1 ) if $picture;
630
631
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-2 / +1 lines)
Lines 152-157 $(document).ready(function() { Link Here
152
[% IF ( borrowernumber ) %]
152
[% IF ( borrowernumber ) %]
153
[% INCLUDE 'members-toolbar.inc' %]
153
[% INCLUDE 'members-toolbar.inc' %]
154
[% END %]
154
[% END %]
155
[% INCLUDE 'messages.inc' %]
155
156
156
<!--  INITIAL BLOC : PARAMETERS & BORROWER INFO -->
157
<!--  INITIAL BLOC : PARAMETERS & BORROWER INFO -->
157
<div style="display: none;" id="add_message_form">
158
<div style="display: none;" id="add_message_form">
Lines 191-198 $(document).ready(function() { Link Here
191
</form>
192
</form>
192
</div>
193
</div>
193
194
194
[% IF ( was_renewed ) %]<div class="dialog message">Patron's account has been renewed until [% expiry | $KohaDates %]</div>[% END %]
195
196
[% IF additional_materials %]
195
[% IF additional_materials %]
197
    <div id="materials" class="dialog message">Note about the accompanying materials: <br />
196
    <div id="materials" class="dialog message">Note about the accompanying materials: <br />
198
    [% additional_materials %]
197
    [% additional_materials %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt (-5 / +1 lines)
Lines 73-83 Link Here
73
    <li><span class="label">Category: </span>[% description %] ([% categorycode %])</li>
73
    <li><span class="label">Category: </span>[% description %] ([% categorycode %])</li>
74
    <li><span class="label">Registration date: </span>[% dateenrolled | $KohaDates %]</li>
74
    <li><span class="label">Registration date: </span>[% dateenrolled | $KohaDates %]</li>
75
    <li><span class="label">Expiration date: </span>
75
    <li><span class="label">Expiration date: </span>
76
    [% IF ( was_renewed ) %]
76
        [% dateexpiry | $KohaDates %]
77
            <strong class="reregistrinfo">[% dateexpiry | $KohaDates %]</strong>
78
    [% ELSE %]
79
            [% dateexpiry | $KohaDates %]
80
    [% END %]
81
    </li>
77
    </li>
82
    <li><span class="label">Library: </span>[% branchname %]</li>
78
    <li><span class="label">Library: </span>[% branchname %]</li>
83
79
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-7 / +2 lines)
Lines 164-175 function validate1(date) { Link Here
164
</div>
164
</div>
165
[% END %]
165
[% END %]
166
<div class="yui-g">
166
<div class="yui-g">
167
  [% INCLUDE 'messages.inc' %]
167
168
168
[% IF ( unknowuser ) %]
169
[% IF ( unknowuser ) %]
169
   <div class="dialog message">This patron does not exist.</div>
170
   <div class="dialog message">This patron does not exist.</div>
170
[% ELSE %]
171
[% ELSE %]
171
    [% IF ( was_renewed ) %]<div class="dialog message">Patron's account has been renewed until [% dateexpiry | $KohaDates %]</div>[% END %]
172
173
    [% IF ( flagged ) %]
172
    [% IF ( flagged ) %]
174
    <div id="circmessages" class="circmessage attention">
173
    <div id="circmessages" class="circmessage attention">
175
        <ul>
174
        <ul>
Lines 342-352 function validate1(date) { Link Here
342
    <li><span class="label">Registration date: </span>[% dateenrolled | $KohaDates %]</li>
341
    <li><span class="label">Registration date: </span>[% dateenrolled | $KohaDates %]</li>
343
    
342
    
344
    <li><span class="label">Expiration date: </span>
343
    <li><span class="label">Expiration date: </span>
345
    [% IF ( was_renewed ) %]
344
        [% dateexpiry | $KohaDates %]
346
            <strong class="reregistrinfo">[% dateexpiry | $KohaDates %]</strong>
347
    [% ELSE %]
348
            [% dateexpiry | $KohaDates %]
349
    [% END %]
350
    </li>
345
    </li>
351
    
346
    
352
    <li><span class="label">Library: </span>[% branchname %]</li>
347
    <li><span class="label">Library: </span>[% branchname %]</li>
(-)a/members/moremember.pl (-1 lines)
Lines 340-346 $template->param( Link Here
340
    borrowernumber  => $borrowernumber,
340
    borrowernumber  => $borrowernumber,
341
    othernames      => $data->{'othernames'},
341
    othernames      => $data->{'othernames'},
342
    categoryname    => $data->{'description'},
342
    categoryname    => $data->{'description'},
343
    was_renewed     => $input->param('was_renewed') ? 1 : 0,
344
    branch          => $branch,
343
    branch          => $branch,
345
    todaysdate      => output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }),
344
    todaysdate      => output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }),
346
    totalprice      => sprintf("%.2f", $totalprice),
345
    totalprice      => sprintf("%.2f", $totalprice),
(-)a/members/setstatus.pl (-12 / +11 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 53-68 if ( $reregistration eq 'y' ) { Link Here
53
	$sth->finish;
56
	$sth->finish;
54
	}
57
	}
55
58
56
if($destination eq "circ"){
59
if ($dateexpiry) {
57
    if($dateexpiry){
60
    $dateexpiry = output_pref({dt => dt_from_string($dateexpiry, 'iso'), dateonly => 1});
58
        print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber&was_renewed=1");
61
    messages_set(gettext("Patron's account has been renewed until %1", $dateexpiry));
59
    } else {
62
}
60
        print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber");
63
61
    }
64
if ($destination eq "circ") {
65
    print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber");
62
} else {
66
} else {
63
    if($dateexpiry){
67
    print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber");
64
        print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber&was_renewed=1");
65
    } else {
66
        print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber");
67
    }
68
}
68
}
69
- 

Return to bug 11904