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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-3 / +3 lines)
Lines 385-394 Link Here
385
                    </div>
385
                    </div>
386
                [% END # /IF ( exceeded_maxreserves || ... %]
386
                [% END # /IF ( exceeded_maxreserves || ... %]
387
387
388
                [% IF ( expiry || diffbranch || patron.is_debarred || ( amount_outstanding && Koha.Preference('maxoutstanding') && amount_outstanding > Koha.Preference('maxoutstanding') ) ) %]
388
                [% IF ( patron.is_expired || diffbranch || patron.is_debarred || ( amount_outstanding && Koha.Preference('maxoutstanding') && amount_outstanding > Koha.Preference('maxoutstanding') ) ) %]
389
                    <div class="dialog message">
389
                    <div class="dialog message">
390
                        <ul>
390
                        <ul>
391
                            [% IF ( expiry ) %]
391
                            [% IF ( patron.is_expired ) %]
392
                                <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %]</a>: <strong>Account has expired</strong></li>
392
                                <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %]</a>: <strong>Account has expired</strong></li>
393
                            [% END %]
393
                            [% END %]
394
394
Lines 405-411 Link Here
405
                            [% END %]
405
                            [% END %]
406
                        </ul> <!-- /.dialog.message -->
406
                        </ul> <!-- /.dialog.message -->
407
                    </div>
407
                    </div>
408
                [% END # /IF expiry || diffbranch ... %]
408
                [% END # /IF patron.is_expired || diffbranch ... %]
409
409
410
                [% IF ( messageborrower ) %]
410
                [% IF ( messageborrower ) %]
411
                    <div class="dialog alert">
411
                    <div class="dialog alert">
(-)a/reserve/request.pl (-10 lines)
Lines 204-217 if ($borrowernumber_hold && !$action) { Link Here
204
        );
204
        );
205
    }
205
    }
206
206
207
    # we check the date expiry of the borrower (only if there is an expiry date, otherwise, set to 1 (warn)
208
    my $expiry_date = $patron->dateexpiry;
209
    my $expiry = 0; # flag set if patron account has expired
210
    if ($expiry_date and
211
        Date_to_Days(split /-/,$date) > Date_to_Days(split /-/,$expiry_date)) {
212
        $expiry = 1;
213
    }
214
215
    # check if the borrower make the reserv in a different branch
207
    # check if the borrower make the reserv in a different branch
216
    if ( $patron->branchcode ne C4::Context->userenv->{'branch'} ) {
208
    if ( $patron->branchcode ne C4::Context->userenv->{'branch'} ) {
217
        $diffbranch = 1;
209
        $diffbranch = 1;
Lines 220-226 if ($borrowernumber_hold && !$action) { Link Here
220
    my $amount_outstanding = $patron->account->balance;
212
    my $amount_outstanding = $patron->account->balance;
221
    $template->param(
213
    $template->param(
222
                patron              => $patron,
214
                patron              => $patron,
223
                expiry              => $expiry,
224
                diffbranch          => $diffbranch,
215
                diffbranch          => $diffbranch,
225
                messages            => $messages,
216
                messages            => $messages,
226
                warnings            => $warnings,
217
                warnings            => $warnings,
227
- 

Return to bug 29116