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

(-)a/circ/circulation.pl (-2 / +5 lines)
Lines 627-632 if ($patron) { Link Here
627
        $template->param( is_anonymous => 1 );
627
        $template->param( is_anonymous => 1 );
628
        $noissues = 1;
628
        $noissues = 1;
629
    }
629
    }
630
    my $lines                = Koha::Account::Lines->search( { borrowernumber => $patron->id } );
631
    my $credits_balance      = $lines->credits_total;
630
    my $patron_charge_limits = $patron->is_patron_inside_charge_limits();
632
    my $patron_charge_limits = $patron->is_patron_inside_charge_limits();
631
    if ( $patron_charge_limits->{noissuescharge}->{charge} > 0 ) {
633
    if ( $patron_charge_limits->{noissuescharge}->{charge} > 0 ) {
632
        my $noissuescharge =
634
        my $noissuescharge =
Lines 637-646 if ($patron) { Link Here
637
            charges       => 1,
639
            charges       => 1,
638
            chargesamount => $patron_charge_limits->{noissuescharge}->{charge},
640
            chargesamount => $patron_charge_limits->{noissuescharge}->{charge},
639
        );
641
        );
640
    } elsif ( $balance < 0 ) {
642
    }
643
    if ( $credits_balance < 0 ) {
641
        $template->param(
644
        $template->param(
642
            credits       => 1,
645
            credits       => 1,
643
            creditsamount => -$balance,
646
            creditsamount => -$credits_balance,
644
        );
647
        );
645
    }
648
    }
646
649
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc (-1 / +1 lines)
Lines 155-161 Link Here
155
        [% END %]
155
        [% END %]
156
156
157
        [% IF ( credits ) %]
157
        [% IF ( credits ) %]
158
            <li class="credits"> <span class="circ-hlt">Credits:</span> Patron has a credit[% IF ( creditsamount ) %]of <span class="credit"><strong>[% creditsamount | $Price %]</strong></span>[% END %] </li>
158
            <li class="credits"> <span class="circ-hlt">Credits:</span> Patron has outstanding credits[% IF ( creditsamount ) %]of <span class="credit"><strong>[% creditsamount | $Price %]</strong></span>[% END %] </li>
159
        [% END %]
159
        [% END %]
160
        [% IF (noissues && CAN_user_circulate_force_checkout && !moremember) %]
160
        [% IF (noissues && CAN_user_circulate_force_checkout && !moremember) %]
161
            <li>
161
            <li>
(-)a/members/moremember.pl (-3 / +6 lines)
Lines 238-253 my $issues = $patron->checkouts; Link Here
238
my $balance = 0;
238
my $balance = 0;
239
$balance = $patron->account->balance;
239
$balance = $patron->account->balance;
240
240
241
my $lines           = Koha::Account::Lines->search( { borrowernumber => $patron->id } );
242
my $credits_balance = $lines->credits_total;
243
241
my $patron_charge_limits = $patron->is_patron_inside_charge_limits();
244
my $patron_charge_limits = $patron->is_patron_inside_charge_limits();
242
if ( $patron_charge_limits->{noissuescharge}->{charge} > 0 ) {
245
if ( $patron_charge_limits->{noissuescharge}->{charge} > 0 ) {
243
    $template->param(
246
    $template->param(
244
        charges       => 1,
247
        charges       => 1,
245
        chargesamount => $patron_charge_limits->{noissuescharge}->{charge},
248
        chargesamount => $patron_charge_limits->{noissuescharge}->{charge},
246
    );
249
    );
247
} elsif ( $balance < 0 ) {
250
}
251
if ( $credits_balance < 0 ) {
248
    $template->param(
252
    $template->param(
249
        credits       => 1,
253
        credits       => 1,
250
        creditsamount => -$balance,
254
        creditsamount => -$credits_balance,
251
    );
255
    );
252
}
256
}
253
257
254
- 

Return to bug 38532