Attachment #125860 for bug #29116

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




                    </div>
                [% END # /IF ( exceeded_maxreserves || ... %]

                [% IF ( patron.is_expired || diffbranch || patron.is_debarred || ( amount_outstanding && Koha.Preference('maxoutstanding') && amount_outstanding > Koha.Preference('maxoutstanding') ) ) %]
                    <div class="dialog message">
                        <ul>
                            [% IF ( patron.is_expired ) %]
                                <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>
                            [% END %]


                            [% END %]
                        </ul> <!-- /.dialog.message -->
                    </div>
                [% END # /IF patron.is_expired || diffbranch ... %]

                [% IF ( messageborrower ) %]
                    <div class="dialog alert">




        );
    }

    # we check the date expiry of the borrower (only if there is an expiry date, otherwise, set to 1 (warn)
    my $expiry_date = $patron->dateexpiry;
    my $expiry = 0; # flag set if patron account has expired
    if ($expiry_date and
        Date_to_Days(split /-/,$date) > Date_to_Days(split /-/,$expiry_date)) {
        $expiry = 1;
    }

    # check if the borrower make the reserv in a different branch
    if ( $patron->branchcode ne C4::Context->userenv->{'branch'} ) {
        $diffbranch = 1;

    my $amount_outstanding = $patron->account->balance;
    $template->param(
                patron              => $patron,
                expiry              => $expiry,
                diffbranch          => $diffbranch,
                messages            => $messages,
                warnings            => $warnings,
- 

Return to bug 29116

Lines 385-394 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-3 / +3 lines)
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">

Lines 226-239 if ($borrowernumber_hold && !$action) { Link Here

(-)a/reserve/request.pl (-10 lines)
226	);	226	);
227	}	227	}
228		228
229	# we check the date expiry of the borrower (only if there is an expiry date, otherwise, set to 1 (warn)
230	my $expiry_date = $patron->dateexpiry;
231	my $expiry = 0; # flag set if patron account has expired
232	if ($expiry_date and
233	Date_to_Days(split /-/,$date) > Date_to_Days(split /-/,$expiry_date)) {
234	$expiry = 1;
235	}
236
237	# check if the borrower make the reserv in a different branch	229	# check if the borrower make the reserv in a different branch
238	if ( $patron->branchcode ne C4::Context->userenv->{'branch'} ) {	230	if ( $patron->branchcode ne C4::Context->userenv->{'branch'} ) {
239	$diffbranch = 1;	231	$diffbranch = 1;
Lines 242-248 if ($borrowernumber_hold && !$action) { Link Here
242	my $amount_outstanding = $patron->account->balance;	234	my $amount_outstanding = $patron->account->balance;
243	$template->param(	235	$template->param(
244	patron => $patron,	236	patron => $patron,
245	expiry => $expiry,
246	diffbranch => $diffbranch,	237	diffbranch => $diffbranch,
247	messages => $messages,	238	messages => $messages,
248	warnings => $warnings,	239	warnings => $warnings,
249	-