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

(-)a/C4/SIP/ILS.pm (-6 / +8 lines)
Lines 140-151 sub checkout { Link Here
140
        } elsif ($patron->expired) {
140
        } elsif ($patron->expired) {
141
            $circ->screen_msg("Patron expired on " . output_pref({ dt => dt_from_string( $patron->dateexpiry_iso, 'iso' ), dateonly => 1 }));
141
            $circ->screen_msg("Patron expired on " . output_pref({ dt => dt_from_string( $patron->dateexpiry_iso, 'iso' ), dateonly => 1 }));
142
        } elsif ($patron->fine_blocked) {
142
        } elsif ($patron->fine_blocked) {
143
            my $message = "Patron has fines";
143
            if ( !C4::Context->preference("IssuingInProcess") ) {
144
            if ($account->{show_outstanding_amount}) {
144
                my $message = "Patron has fines";
145
                my $patron_account = Koha::Account->new( { patron_id => $patron->{borrowernumber} });
145
                if ($account->{show_outstanding_amount}) {
146
                my $balance = $patron_account->balance;
146
                    my $patron_account = Koha::Account->new( { patron_id => $patron->{borrowernumber} });
147
                if ($balance) {
147
                    my $balance = $patron_account->balance;
148
                    $message .= (" - You owe " . Koha::Number::Price->new( $balance )->format({ with_symbol => 1}) . ".");
148
                    if ($balance) {
149
                        $message .= (" - You owe " . Koha::Number::Price->new( $balance )->format({ with_symbol => 1}) . ".");
150
                    }
149
                }
151
                }
150
            }
152
            }
151
            $circ->screen_msg($message);
153
            $circ->screen_msg($message);
(-)a/C4/SIP/ILS/Patron.pm (-4 / +5 lines)
Lines 86-93 sub new { Link Here
86
    my $fine_blocked = 0;
86
    my $fine_blocked = 0;
87
    my $noissueschargeguarantees = C4::Context->preference('NoIssuesChargeGuarantees');
87
    my $noissueschargeguarantees = C4::Context->preference('NoIssuesChargeGuarantees');
88
    if( $fines_amount > $fee_limit ){
88
    if( $fines_amount > $fee_limit ){
89
        $fine_blocked = 1;
89
        if ( !C4::Context->preference("IssuingInProcess") ) {
90
        $fines_msg .= " -- " . "Patron blocked by fines" if $fine_blocked;
90
            $fine_blocked = 1;
91
            $fines_msg .= " -- " . "Patron blocked by fines" if $fine_blocked;
92
        }
91
    } elsif ( $noissueschargeguarantorswithguarantees ) {
93
    } elsif ( $noissueschargeguarantorswithguarantees ) {
92
        $fines_amount += $patron->relationships_debt({ include_guarantors => 1, only_this_guarantor => 0, include_this_patron => 0 });
94
        $fines_amount += $patron->relationships_debt({ include_guarantors => 1, only_this_guarantor => 0, include_this_patron => 0 });
93
        $fine_blocked ||= $fines_amount > $noissueschargeguarantorswithguarantees;
95
        $fine_blocked ||= $fines_amount > $noissueschargeguarantorswithguarantees;
Lines 155-161 sub new { Link Here
155
        if ($_ ne 'NOTES' and $flags->{$_}->{message}) {
157
        if ($_ ne 'NOTES' and $flags->{$_}->{message}) {
156
            $ilspatron{screen_msg} .= " -- " . $flags->{$_}->{message};  # show all but internal NOTES
158
            $ilspatron{screen_msg} .= " -- " . $flags->{$_}->{message};  # show all but internal NOTES
157
        }
159
        }
158
        if ($flags->{$_}->{noissues}) {
160
        if ($flags->{$_}->{noissues} && !C4::Context->preference("IssuingInProcess")) {
159
            foreach my $toggle (qw(charge_ok renew_ok recall_ok hold_ok inet)) {
161
            foreach my $toggle (qw(charge_ok renew_ok recall_ok hold_ok inet)) {
160
                $ilspatron{$toggle} = 0;    # if we get noissues, disable everything
162
                $ilspatron{$toggle} = 0;    # if we get noissues, disable everything
161
            }
163
            }
162
- 

Return to bug 32602