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

(-)a/circ/circulation.pl (-1 / +4 lines)
Lines 491-500 if ( $patron ) { Link Here
491
        $noissues = 1;
491
        $noissues = 1;
492
    }
492
    }
493
    my $account = $patron->account;
493
    my $account = $patron->account;
494
    if( ( my $owing = $account->non_issues_charges ) > 0 ) {
494
    my $owing = $account->non_issues_charges;
495
    my $issues_charges = $balance - $owing;
496
    if( $owing > 0 || $issues_charges > 0 ) {
495
        my $noissuescharge = C4::Context->preference("noissuescharge") || 5; # FIXME If noissuescharge == 0 then 5, why??
497
        my $noissuescharge = C4::Context->preference("noissuescharge") || 5; # FIXME If noissuescharge == 0 then 5, why??
496
        $noissues ||= ( not C4::Context->preference("AllowFineOverride") and ( $owing > $noissuescharge ) );
498
        $noissues ||= ( not C4::Context->preference("AllowFineOverride") and ( $owing > $noissuescharge ) );
497
        $template->param(
499
        $template->param(
500
            fees    => $issues_charges,
498
            charges => 1,
501
            charges => 1,
499
            chargesamount => $owing,
502
            chargesamount => $owing,
500
        )
503
        )
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc (-2 / +5 lines)
Lines 1-12 Link Here
1
[% USE Price %]
1
[% USE Price %]
2
[% SET NoIssuesCharge = Koha.Preference('noissuescharge') %]
2
[% SET NoIssuesCharge = Koha.Preference('noissuescharge') %]
3
[% IF fines and fines > 0 %]
3
[% IF fines and fines > 0 || fees and fees > 0 %]
4
    <li>
4
    <li>
5
        <span class="circ-hlt">Charges:</span>
5
        <span class="circ-hlt">Charges:</span>
6
        <span>Patron has outstanding charges of [% fines | $Price %].</span>
6
        <span>Patron has outstanding charges of [% fines | $Price %] that count towards blocking.</span>
7
        [% IF !Koha.Preference('AllowFineOverride') && NoIssuesCharge && fines > NoIssuesCharge %]
7
        [% IF !Koha.Preference('AllowFineOverride') && NoIssuesCharge && fines > NoIssuesCharge %]
8
           <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span>
8
           <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span>
9
        [% END %]
9
        [% END %]
10
        [% IF fees and fees > 0 %]
11
            <span>Patron has outstanding fees of [% fees | $Price %] that do not count towards blocking. </span>
12
        [% END%]
10
        [% IF CAN_user_updatecharges_remaining_permissions %]
13
        [% IF CAN_user_updatecharges_remaining_permissions %]
11
            <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]" class="btn btn-default btn-xs" >Make payment</a>
14
            <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]" class="btn btn-default btn-xs" >Make payment</a>
12
            <a href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% patron.borrowernumber | uri %]" class="btn btn-default btn-xs" >Pay all charges</a>
15
            <a href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% patron.borrowernumber | uri %]" class="btn btn-default btn-xs" >Pay all charges</a>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc (-1 lines)
Lines 98-104 Link Here
98
        [% IF age_limitations %]
98
        [% IF age_limitations %]
99
            [% INCLUDE 'category-out-of-age-limit.inc' %]
99
            [% INCLUDE 'category-out-of-age-limit.inc' %]
100
        [% END %]
100
        [% END %]
101
102
        [% IF ( charges ) %]
101
        [% IF ( charges ) %]
103
            [% INCLUDE 'blocked-fines.inc' fines = chargesamount %]
102
            [% INCLUDE 'blocked-fines.inc' fines = chargesamount %]
104
        [% END %]
103
        [% END %]
(-)a/members/moremember.pl (-2 / +6 lines)
Lines 241-250 my $issues = $patron->checkouts; Link Here
241
my $balance = 0;
241
my $balance = 0;
242
$balance = $patron->account->balance;
242
$balance = $patron->account->balance;
243
243
244
244
my $account = $patron->account;
245
my $account = $patron->account;
245
if( ( my $owing = $account->non_issues_charges ) > 0 ) {
246
my $owing = $account->non_issues_charges;
247
my $issues_charges = $balance - $owing;
248
if ( $owing  > 0 || $issues_charges > 0 ) {
246
    my $noissuescharge = C4::Context->preference("noissuescharge") || 5; # FIXME If noissuescharge == 0 then 5, why??
249
    my $noissuescharge = C4::Context->preference("noissuescharge") || 5; # FIXME If noissuescharge == 0 then 5, why??
247
    $template->param(
250
    $template->param(
251
        fees    => $issues_charges,
248
        charges => 1,
252
        charges => 1,
249
        chargesamount => $owing,
253
        chargesamount => $owing,
250
    )
254
    )
Lines 288-293 elsif ( $patron->is_going_to_expire ) { Link Here
288
292
289
my $has_modifications = Koha::Patron::Modifications->search( { borrowernumber => $borrowernumber } )->count;
293
my $has_modifications = Koha::Patron::Modifications->search( { borrowernumber => $borrowernumber } )->count;
290
294
295
291
$template->param(
296
$template->param(
292
    patron          => $patron,
297
    patron          => $patron,
293
    issuecount      => $patron->checkouts->count,
298
    issuecount      => $patron->checkouts->count,
294
- 

Return to bug 33264