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

(-)a/circ/circulation.pl (-2 / +2 lines)
Lines 230-236 if ($borrowernumber) { Link Here
230
            0 , $borrower->{'enrolmentperiod'});
230
            0 , $borrower->{'enrolmentperiod'});
231
    }
231
    }
232
    # if the expiry date is before today ie they have expired
232
    # if the expiry date is before today ie they have expired
233
    if ( $warning_year*$warning_month*$warning_day==0 
233
    if ( !$borrower->{'dateexpiry'} || $warning_year*$warning_month*$warning_day==0
234
        || Date_to_Days($today_year,     $today_month, $today_day  ) 
234
        || Date_to_Days($today_year,     $today_month, $today_day  ) 
235
         > Date_to_Days($warning_year, $warning_month, $warning_day) )
235
         > Date_to_Days($warning_year, $warning_month, $warning_day) )
236
    {
236
    {
Lines 238-244 if ($borrowernumber) { Link Here
238
        $template->param(
238
        $template->param(
239
            flagged  => "1",
239
            flagged  => "1",
240
            noissues => "1",
240
            noissues => "1",
241
            expired     => format_date($borrower->{dateexpiry}),
241
            expired => "1",
242
            renewaldate => format_date("$renew_year-$renew_month-$renew_day")
242
            renewaldate => format_date("$renew_year-$renew_month-$renew_day")
243
        );
243
        );
244
    }
244
    }
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-2 / +1 lines)
Lines 554-560 No patron matched <span class="ex">[% message %]</span> Link Here
554
554
555
			[% IF ( expired ) %]
555
			[% IF ( expired ) %]
556
			<li><span class="circ-hlt">Expiration:</span> Patron's card has expired.
556
			<li><span class="circ-hlt">Expiration:</span> Patron's card has expired.
557
			Patron's card expired on [% expiry %] <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% borrowernumber %]&amp;cardnumber=[% cardnumber %]&amp;destination=circ&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% borrowernumber %]&amp;categorycode=[% categorycode %]">Edit Details</a>
557
			[% IF ( expiry ) %]Patron's card expired on [% expiry %][% END %] <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% borrowernumber %]&amp;cardnumber=[% cardnumber %]&amp;destination=circ&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% borrowernumber %]&amp;categorycode=[% categorycode %]">Edit Details</a>
558
558
559
			</li>
559
			</li>
560
			[% END %]
560
			[% END %]
561
- 

Return to bug 6487