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

(-)a/circ/circulation.pl (+4 lines)
Lines 643-648 if ($patron) { Link Here
643
        $noissues = 1;
643
        $noissues = 1;
644
    }
644
    }
645
645
646
    my $account_balance = $patron->account->balance();
647
    $template->param(
648
        account_balance => $account_balance,
649
    );
646
    my $patron_charge_limits = $patron->is_patron_inside_charge_limits();
650
    my $patron_charge_limits = $patron->is_patron_inside_charge_limits();
647
    if ( $patron_charge_limits->{noissuescharge}->{charge} > 0 ) {
651
    if ( $patron_charge_limits->{noissuescharge}->{charge} > 0 ) {
648
        my $noissuescharge =
652
        my $noissuescharge =
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc (-5 / +10 lines)
Lines 1-15 Link Here
1
[% USE Price %]
1
[% USE Price %]
2
[% USE Categories %]
2
[% USE Categories %]
3
[% IF account_balance && account_balance != NoIssueCharge %]
4
    <li>Total balance: [% account_balance | $Price %]</li>
5
[% END %]
3
[% IF NoIssuesCharge and NoIssuesCharge > 0 %]
6
[% IF NoIssuesCharge and NoIssuesCharge > 0 %]
4
    <li>
7
    <li>
5
        <span class="circ-hlt">Charges:</span>
8
        <span class="circ-hlt">Charges:</span>
6
        <span>Patron has outstanding charges of [% NoIssuesCharge | $Price %].</span>
9
        <span>Patron has outstanding charges that may block checkouts of [% NoIssuesCharge | $Price %].</span>
7
        [% IF !Koha.Preference('AllowFineOverride') && NoIssuesCharge.limit && NoIssuesCharge.overlimit %]
10
        [% IF !Koha.Preference('AllowFineOverride') && NoIssuesCharge.limit && NoIssuesCharge.overlimit %]
8
            <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span>
11
            <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span>
9
        [% END %]
12
        [% END %]
10
        [% 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>
12
            <a href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% patron.borrowernumber | uri %]" class="btn btn-default btn-xs">Pay all charges</a>
13
        [% END %]
14
    </li>
13
    </li>
15
[% END %]
14
[% END %]
15
<li>
16
    [% IF CAN_user_updatecharges_remaining_permissions %]
17
        <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]" class="btn btn-default btn-xs">Make payment</a>
18
        <a href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% patron.borrowernumber | uri %]" class="btn btn-default btn-xs">Pay all charges</a>
19
    [% END %]
20
</li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc (-3 / +3 lines)
Lines 5-11 Link Here
5
[% SET return_claims = patron.return_claims %]
5
[% SET return_claims = patron.return_claims %]
6
[% SET logged_in_branchcode = Branches.GetLoggedInBranchcode() %]
6
[% SET logged_in_branchcode = Branches.GetLoggedInBranchcode() %]
7
7
8
[% IF ( has_modifications || warndeparture || returnbeforeexpiry || expired || patron.gonenoaddress || patron.lost || userdebarred || odues || ( return_claims.count > ClaimReturnedWarningThreshold ) || age_limitations || limited_category || charges || charges_guarantors_guarantees || charges_guarantees || credits || patron.account_locked ) %]
8
[% IF ( has_modifications || warndeparture || returnbeforeexpiry || expired || patron.gonenoaddress || patron.lost || userdebarred || odues || ( return_claims.count > ClaimReturnedWarningThreshold ) || age_limitations || limited_category || account_balance || charges || charges_guarantors_guarantees || charges_guarantees || credits || patron.account_locked ) %]
9
    <h3>Attention</h3>
9
    <h3>Attention</h3>
10
    <ul>
10
    <ul>
11
        [% IF ( has_modifications ) %]
11
        [% IF ( has_modifications ) %]
Lines 144-151 Link Here
144
            </li>
144
            </li>
145
        [% END %]
145
        [% END %]
146
146
147
        [% IF ( charges ) %]
147
        [% IF ( charges || account_balance ) %]
148
            [% INCLUDE 'blocked-fines.inc' NoIssuesCharge = chargesamount %]
148
            [% INCLUDE 'blocked-fines.inc' NoIssuesCharge = chargesamount account_balance = account_balance %]
149
        [% END %]
149
        [% END %]
150
150
151
        [% IF ( charges_guarantors_guarantees ) %]
151
        [% IF ( charges_guarantors_guarantees ) %]
(-)a/members/moremember.pl (-1 / +5 lines)
Lines 240-245 if ( $patron->has_overdues ) { Link Here
240
}
240
}
241
my $issues = $patron->checkouts;
241
my $issues = $patron->checkouts;
242
242
243
my $account_balance = $patron->account->balance();
244
$template->param(
245
    account_balance => $account_balance,
246
);
247
243
my $patron_charge_limits = $patron->is_patron_inside_charge_limits();
248
my $patron_charge_limits = $patron->is_patron_inside_charge_limits();
244
if ( $patron_charge_limits->{noissuescharge}->{charge} > 0 ) {
249
if ( $patron_charge_limits->{noissuescharge}->{charge} > 0 ) {
245
    $template->param(
250
    $template->param(
246
- 

Return to bug 33228