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

(-)a/circ/circulation.pl (-2 / +1 lines)
Lines 132-138 my $issueconfirmed = $query->param('issueconfirmed'); Link Here
132
my $cancelreserve  = $query->param('cancelreserve');
132
my $cancelreserve  = $query->param('cancelreserve');
133
my $organisation   = $query->param('organisations');
133
my $organisation   = $query->param('organisations');
134
my $print          = $query->param('print') || q{};
134
my $print          = $query->param('print') || q{};
135
my $newexpiry      = $query->param('dateexpiry');
136
my $debt_confirmed = $query->param('debt_confirmed') || 0; # Don't show the debt error dialog twice
135
my $debt_confirmed = $query->param('debt_confirmed') || 0; # Don't show the debt error dialog twice
137
136
138
# Check if stickyduedate is turned off
137
# Check if stickyduedate is turned off
Lines 676-682 $template->param( Link Here
676
    surname           => $borrower->{'surname'},
675
    surname           => $borrower->{'surname'},
677
    showname          => $borrower->{'showname'},
676
    showname          => $borrower->{'showname'},
678
    category_type     => $borrower->{'category_type'},
677
    category_type     => $borrower->{'category_type'},
679
    dateexpiry        => format_date($newexpiry),
678
    was_renewed       => $query->param('was_renewed') ? 1 : 0,
680
    expiry            => format_date($borrower->{'dateexpiry'}),
679
    expiry            => format_date($borrower->{'dateexpiry'}),
681
    categorycode      => $borrower->{'categorycode'},
680
    categorycode      => $borrower->{'categorycode'},
682
    categoryname      => $borrower->{description},
681
    categoryname      => $borrower->{description},
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc (-1 / +1 lines)
Lines 125-131 function export_barcodes() { Link Here
125
    <li id="printmenuc"><a id="printpage" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]&amp;print=page">Print summary</a></li>
125
    <li id="printmenuc"><a id="printpage" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]&amp;print=page">Print summary</a></li>
126
    <li><a id="printslip" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]&amp;print=slip">Print slip</a></li>
126
    <li><a id="printslip" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]&amp;print=slip">Print slip</a></li>
127
    <li id="searchtoholdc"><a id="searchtohold" href="#">Search to hold</a></li>
127
    <li id="searchtoholdc"><a id="searchtohold" href="#">Search to hold</a></li>
128
    [% IF ( CAN_user_borrowers ) %]<li id="moremenuc"><a id="renewpatron" href="/cgi-bin/koha/members/moremember.pl?reregistration=y&amp;borrowernumber=[% borrowernumber %]">Renew account</a></li>[% END %]
128
    [% IF ( CAN_user_borrowers ) %]<li id="moremenuc"><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>[% END %]
129
    [% IF ( CAN_user_permissions ) %]
129
    [% IF ( CAN_user_permissions ) %]
130
        [% IF ( CAN_user_staffaccess ) %]
130
        [% IF ( CAN_user_staffaccess ) %]
131
            <li><a id="patronflags" href="/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]">Set permissions</a></li>
131
            <li><a id="patronflags" href="/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]">Set permissions</a></li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-1 / +1 lines)
Lines 303-309 function validate1(date) { Link Here
303
</form>
303
</form>
304
</div>
304
</div>
305
305
306
[% IF ( dateexpiry ) %]<div class="dialog message">Patron's account has been renewed until [% dateexpiry %]</div>[% END %]
306
[% IF ( was_renewed ) %]<div class="dialog message">Patron's account has been renewed until [% expiry %]</div>[% END %]
307
307
308
[% IF additional_materials %]
308
[% IF additional_materials %]
309
    <div id="materials" class="dialog message">Note about the accompanying materials: <br />
309
    <div id="materials" class="dialog message">Note about the accompanying materials: <br />
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt (-1 / +1 lines)
Lines 76-82 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 ( reregistration ) %]
79
    [% IF ( was_renewed ) %]
80
            <strong class="reregistrinfo">[% dateexpiry %]</strong>
80
            <strong class="reregistrinfo">[% dateexpiry %]</strong>
81
    [% ELSE %]
81
    [% ELSE %]
82
            [% dateexpiry %]
82
            [% dateexpiry %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-2 / +2 lines)
Lines 168-174 function validate1(date) { Link Here
168
[% IF ( unknowuser ) %]
168
[% IF ( unknowuser ) %]
169
   <div class="dialog message">This patron does not exist.</div>
169
   <div class="dialog message">This patron does not exist.</div>
170
[% ELSE %]
170
[% ELSE %]
171
    [% IF ( reregistration ) %]<div class="dialog message">Patron's account has been renewed until [% dateexpiry %]</div>[% END %]
171
    [% IF ( was_renewed ) %]<div class="dialog message">Patron's account has been renewed until [% dateexpiry %]</div>[% END %]
172
172
173
    [% IF ( flagged ) %]
173
    [% IF ( flagged ) %]
174
    <ul>
174
    <ul>
Lines 343-349 function validate1(date) { Link Here
343
    <li><span class="label">Registration date: </span>[% dateenrolled %]</li>
343
    <li><span class="label">Registration date: </span>[% dateenrolled %]</li>
344
    
344
    
345
    <li><span class="label">Expiration date: </span>
345
    <li><span class="label">Expiration date: </span>
346
    [% IF ( reregistration ) %]
346
    [% IF ( was_renewed ) %]
347
            <strong class="reregistrinfo">[% dateexpiry %]</strong>
347
            <strong class="reregistrinfo">[% dateexpiry %]</strong>
348
    [% ELSE %]
348
    [% ELSE %]
349
            [% dateexpiry %]
349
            [% dateexpiry %]
(-)a/members/moremember.pl (-7 / +1 lines)
Lines 119-125 my $borrowernumber = $input->param('borrowernumber'); Link Here
119
119
120
#start the page and read in includes
120
#start the page and read in includes
121
my $data           = GetMember( 'borrowernumber' => $borrowernumber );
121
my $data           = GetMember( 'borrowernumber' => $borrowernumber );
122
my $reregistration = $input->param('reregistration');
123
122
124
if ( not defined $data ) {
123
if ( not defined $data ) {
125
    $template->param (unknowuser => 1);
124
    $template->param (unknowuser => 1);
Lines 127-137 if ( not defined $data ) { Link Here
127
    exit;
126
    exit;
128
}
127
}
129
128
130
# re-reregistration function to automatic calcul of date expiry
131
if ( $reregistration eq 'y' ) {
132
	$data->{'dateexpiry'} = ExtendMemberSubscriptionTo( $borrowernumber );
133
}
134
135
my $category_type = $data->{'category_type'};
129
my $category_type = $data->{'category_type'};
136
130
137
### $category_type
131
### $category_type
Lines 414-420 $template->param( Link Here
414
    borrowernumber  => $borrowernumber,
408
    borrowernumber  => $borrowernumber,
415
    othernames      => $data->{'othernames'},
409
    othernames      => $data->{'othernames'},
416
    categoryname    => $data->{'description'},
410
    categoryname    => $data->{'description'},
417
    reregistration  => $reregistration,
411
    was_renewed     => $input->param('was_renewed') ? 1 : 0,
418
    branch          => $branch,
412
    branch          => $branch,
419
    todaysdate      => C4::Dates->today(),
413
    todaysdate      => C4::Dates->today(),
420
    totalprice      => sprintf("%.2f", $totalprice),
414
    totalprice      => sprintf("%.2f", $totalprice),
(-)a/members/setstatus.pl (-3 / +2 lines)
Lines 58-70 if ( $reregistration eq 'y' ) { Link Here
58
58
59
if($destination eq "circ"){
59
if($destination eq "circ"){
60
	if($dateexpiry){
60
	if($dateexpiry){
61
		print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$cardnumber&dateexpiry=$dateexpiry");
61
		print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$cardnumber&was_renewed=1");
62
	} else {
62
	} else {
63
		print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$cardnumber");
63
		print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$cardnumber");
64
	}
64
	}
65
} else {
65
} else {
66
	if($dateexpiry){
66
	if($dateexpiry){
67
        print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber&dateexpiry=$dateexpiry");
67
        print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber&was_renewed=1");
68
	} else {
68
	} else {
69
        print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber");
69
        print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber");
70
	}
70
	}
71
- 

Return to bug 9406