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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-2 / +2 lines)
Lines 656-662 No patron matched <span class="ex">[% message | html %]</span> Link Here
656
656
657
			[% IF ( warndeparture ) %]
657
			[% IF ( warndeparture ) %]
658
			<li><span class="circ-hlt">Expiration:</span> Patron's card will expire soon.
658
			<li><span class="circ-hlt">Expiration:</span> Patron's card will expire soon.
659
            Patron's card expires on [% expiry | $KohaDates %] <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;destination=circ&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber | html %]&amp;categorycode=[% categorycode | html %]">Edit Details</a>
659
            Patron's card expires on [% expiry | $KohaDates %] <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;destination=circ&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber | html %]&amp;categorycode=[% categorycode | html %]">Edit details</a>
660
660
661
			</li>
661
			</li>
662
			[% END %]
662
			[% END %]
Lines 669-675 No patron matched <span class="ex">[% message | html %]</span> Link Here
669
669
670
			[% IF ( expired ) %]
670
			[% IF ( expired ) %]
671
			<li><span class="circ-hlt">Expiration:</span> Patron's card has expired.
671
			<li><span class="circ-hlt">Expiration:</span> Patron's card has expired.
672
            [% IF ( expiry ) %]Patron's card expired on [% expiry | $KohaDates %][% END %] <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;destination=circ&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber | html %]&amp;categorycode=[% categorycode | html %]">Edit Details</a>
672
            [% IF ( expiry ) %]Patron's card expired on [% expiry | $KohaDates %][% END %] <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;destination=circ&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber | html %]&amp;categorycode=[% categorycode | html %]">Edit details</a>
673
673
674
			</li>
674
			</li>
675
			[% END %]
675
			[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (+17 lines)
Lines 133-138 Link Here
133
                                    [% IF ( lost ) %]
133
                                    [% IF ( lost ) %]
134
                                        <li class="blocker">Patron's card has been reported lost.</li>
134
                                        <li class="blocker">Patron's card has been reported lost.</li>
135
                                    [% END %]
135
                                    [% END %]
136
                                    [% IF ( expired ) %]
137
                                        <li class="blocker">
138
                                            <span class="circ-hlt">Expiration:</span>
139
                                            [% IF ( patron.dateexpiry ) %]
140
                                                Patron's card expired on [% patron.dateexpiry | $KohaDates %].
141
                                            [% ELSE %]
142
                                                Patron's card has expired.
143
                                            [% END %]
144
                                            <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;destination=circ&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber | html %]&amp;categorycode=[% categorycode | html %]">Edit details</a>
145
                                        </li>
146
                                    [% END %]
136
                                </ul>
147
                                </ul>
137
                            </div>
148
                            </div>
138
                        [% END %]
149
                        [% END %]
Lines 428-433 Link Here
428
                                            <span class="label">Expiration date: </span>
439
                                            <span class="label">Expiration date: </span>
429
                                            [% IF ( was_renewed ) %]
440
                                            [% IF ( was_renewed ) %]
430
                                                <strong class="reregistrinfo">[% patron.dateexpiry | $KohaDates %]</strong>
441
                                                <strong class="reregistrinfo">[% patron.dateexpiry | $KohaDates %]</strong>
442
                                            [% ELSIF ( expired ) %]
443
                                                <span class="blocker">
444
                                                    [% patron.dateexpiry | $KohaDates %]
445
                                                    <strong><em>Expired</em></strong>
446
                                                    <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify]&amp;borrowernumber=[% patron.borrowernumber | html %]&amp;categorycode=[% categorycode | html %]">Edit details</a>
447
                                                </span>
431
                                            [% ELSE %]
448
                                            [% ELSE %]
432
                                                [% patron.dateexpiry | $KohaDates %]
449
                                                [% patron.dateexpiry | $KohaDates %]
433
                                            [% END %]
450
                                            [% END %]
(-)a/members/moremember.pl (-1 / +16 lines)
Lines 308-313 if( $patron_messages->count > 0 ){ Link Here
308
my ( $subtag, $region ) = split '-', $patron->lang;
308
my ( $subtag, $region ) = split '-', $patron->lang;
309
my $translated_language = C4::Languages::language_get_description( $subtag, $subtag, 'language' );
309
my $translated_language = C4::Languages::language_get_description( $subtag, $subtag, 'language' );
310
310
311
# if the expiry date is before today ie they have expired
312
if ( $patron->is_expired ) {
313
    $template->param(
314
        expired => "1",
315
        flagged => 1
316
    );
317
}
318
# check for NotifyBorrowerDeparture
319
elsif ( $patron->is_going_to_expire ) {
320
    # borrower card soon to expire warn librarian
321
    $template->param(
322
        "warndeparture" => $patron->dateexpiry,
323
        flagged => 1
324
    );
325
}
326
311
my $total = $patron->account->balance;
327
my $total = $patron->account->balance;
312
$template->param(
328
$template->param(
313
    patron          => $patron,
329
    patron          => $patron,
314
- 

Return to bug 22134