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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-3 / +13 lines)
Lines 133-139 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 ) %]
136
                                    [% IF ( patron.is_expired ) %]
137
                                        <li class="blocker">
137
                                        <li class="blocker">
138
                                            <span class="circ-hlt">Expiration:</span>
138
                                            <span class="circ-hlt">Expiration:</span>
139
                                            [% IF ( patron.dateexpiry ) %]
139
                                            [% IF ( patron.dateexpiry ) %]
Lines 141-147 Link Here
141
                                            [% ELSE %]
141
                                            [% ELSE %]
142
                                                Patron's card has expired.
142
                                                Patron's card has expired.
143
                                            [% END %]
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>
144
                                            <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>
145
                                        </li>
146
                                    [% ELSIF ( patron.is_going_to_expire ) %]
147
                                        <li>
148
                                            <span class="circ-hlt">Expiration:</span> Patron's card will expire soon.
149
                                            Patron's card expires on [% expiry | $KohaDates %]
150
                                            <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>
145
                                        </li>
151
                                        </li>
146
                                    [% END %]
152
                                    [% END %]
147
                                </ul>
153
                                </ul>
Lines 439-450 Link Here
439
                                            <span class="label">Expiration date: </span>
445
                                            <span class="label">Expiration date: </span>
440
                                            [% IF ( was_renewed ) %]
446
                                            [% IF ( was_renewed ) %]
441
                                                <strong class="reregistrinfo">[% patron.dateexpiry | $KohaDates %]</strong>
447
                                                <strong class="reregistrinfo">[% patron.dateexpiry | $KohaDates %]</strong>
442
                                            [% ELSIF ( expired ) %]
448
                                            [% ELSIF ( patron.is_expired ) %]
443
                                                <span class="blocker">
449
                                                <span class="blocker">
444
                                                    [% patron.dateexpiry | $KohaDates %]
450
                                                    [% patron.dateexpiry | $KohaDates %]
445
                                                    <strong><em>Expired</em></strong>
451
                                                    <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>
452
                                                    <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>
453
                                                </span>
454
                                            [% ELSIF ( patron.is_going_to_expire ) %]
455
                                                [% patron.dateexpiry | $KohaDates %]
456
                                                <strong><em>Patron expires soon</em></strong>
457
                                                <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>
448
                                            [% ELSE %]
458
                                            [% ELSE %]
449
                                                [% patron.dateexpiry | $KohaDates %]
459
                                                [% patron.dateexpiry | $KohaDates %]
450
                                            [% END %]
460
                                            [% END %]
(-)a/members/moremember.pl (-11 / +1 lines)
Lines 309-325 my ( $subtag, $region ) = split '-', $patron->lang; Link Here
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
311
# if the expiry date is before today ie they have expired
312
if ( $patron->is_expired ) {
312
if ( $patron->is_expired || $patron->is_going_to_expire ) {
313
    $template->param(
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
314
        flagged => 1
324
    );
315
    );
325
}
316
}
326
- 

Return to bug 22134