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

(-)a/C4/Circulation.pm (-6 / +6 lines)
Lines 776-795 sub CanBookBeIssued { Link Here
776
776
777
    if ( C4::Context->preference("IssuingInProcess") ) {
777
    if ( C4::Context->preference("IssuingInProcess") ) {
778
        if ( $non_issues_charges > $amountlimit && !$inprocess && !$allowfineoverride) {
778
        if ( $non_issues_charges > $amountlimit && !$inprocess && !$allowfineoverride) {
779
            $issuingimpossible{DEBT} = sprintf( "%.2f", $non_issues_charges );
779
            $issuingimpossible{DEBT} = $non_issues_charges;
780
        } elsif ( $non_issues_charges > $amountlimit && !$inprocess && $allowfineoverride) {
780
        } elsif ( $non_issues_charges > $amountlimit && !$inprocess && $allowfineoverride) {
781
            $needsconfirmation{DEBT} = sprintf( "%.2f", $non_issues_charges );
781
            $needsconfirmation{DEBT} = $non_issues_charges;
782
        } elsif ( $allfinesneedoverride && $non_issues_charges > 0 && $non_issues_charges <= $amountlimit && !$inprocess ) {
782
        } elsif ( $allfinesneedoverride && $non_issues_charges > 0 && $non_issues_charges <= $amountlimit && !$inprocess ) {
783
            $needsconfirmation{DEBT} = sprintf( "%.2f", $non_issues_charges );
783
            $needsconfirmation{DEBT} = $non_issues_charges;
784
        }
784
        }
785
    }
785
    }
786
    else {
786
    else {
787
        if ( $non_issues_charges > $amountlimit && $allowfineoverride ) {
787
        if ( $non_issues_charges > $amountlimit && $allowfineoverride ) {
788
            $needsconfirmation{DEBT} = sprintf( "%.2f", $non_issues_charges );
788
            $needsconfirmation{DEBT} = $non_issues_charges;
789
        } elsif ( $non_issues_charges > $amountlimit && !$allowfineoverride) {
789
        } elsif ( $non_issues_charges > $amountlimit && !$allowfineoverride) {
790
            $issuingimpossible{DEBT} = sprintf( "%.2f", $non_issues_charges );
790
            $issuingimpossible{DEBT} = $non_issues_charges;
791
        } elsif ( $non_issues_charges > 0 && $allfinesneedoverride ) {
791
        } elsif ( $non_issues_charges > 0 && $allfinesneedoverride ) {
792
            $needsconfirmation{DEBT} = sprintf( "%.2f", $non_issues_charges );
792
            $needsconfirmation{DEBT} = $non_issues_charges;
793
        }
793
        }
794
    }
794
    }
795
795
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-1 / +1 lines)
Lines 97-103 Link Here
97
[% END %]
97
[% END %]
98
98
99
[% IF ( DEBT ) %]
99
[% IF ( DEBT ) %]
100
    <li>The patron has a debt of [% DEBT %].</li>
100
    <li>The patron has a debt of [% DEBT | $Price %].</li>
101
[% END %]
101
[% END %]
102
102
103
[% IF ( DEBT_GUARANTEES ) %]
103
[% IF ( DEBT_GUARANTEES ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt (-1 / +1 lines)
Lines 247-253 Link Here
247
                      <li><i class="fa fa-li fa-exclamation"></i>The barcode was not found [% checkout_info.barcode |html %].</li>
247
                      <li><i class="fa fa-li fa-exclamation"></i>The barcode was not found [% checkout_info.barcode |html %].</li>
248
                  [% END %]
248
                  [% END %]
249
                  [% IF checkout_info.DEBT %]
249
                  [% IF checkout_info.DEBT %]
250
                      <li><i class="fa fa-li fa-exclamation"></i>The patron has a debt of [% checkout_info.DEBT %].</li> <!-- Need debt_confirmed -->
250
                      <li><i class="fa fa-li fa-exclamation"></i>The patron has a debt of [% checkout_info.DEBT | $Price %].</li> <!-- Need debt_confirmed -->
251
                  [% END %]
251
                  [% END %]
252
                </p>
252
                </p>
253
              [% END %]
253
              [% END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt (-1 / +2 lines)
Lines 1-6 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% USE KohaDates %]
2
[% USE KohaDates %]
3
[% USE AudioAlerts %]
3
[% USE AudioAlerts %]
4
[% USE Price %]
4
[% INCLUDE 'doc-head-open.inc' %]
5
[% INCLUDE 'doc-head-open.inc' %]
5
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha [% END %] &rsaquo; Self checkout </title>
6
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha [% END %] &rsaquo; Self checkout </title>
6
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
7
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
Lines 53-59 Link Here
53
                                [% ELSIF ( circ_error_NOT_FOR_LOAN ) %]
54
                                [% ELSIF ( circ_error_NOT_FOR_LOAN ) %]
54
                                    This item is not for loan.
55
                                    This item is not for loan.
55
                                [% ELSIF ( circ_error_DEBT ) %]
56
                                [% ELSIF ( circ_error_DEBT ) %]
56
                                    You owe the library [% amount %] and cannot check out.
57
                                    You owe the library [% DEBT | $Price %] and cannot check out.
57
                                [% ELSIF ( circ_error_WTHDRAWN ) %]
58
                                [% ELSIF ( circ_error_WTHDRAWN ) %]
58
                                    This item has been withdrawn from the collection.
59
                                    This item has been withdrawn from the collection.
59
                                [% ELSIF ( circ_error_RESTRICTED ) %]
60
                                [% ELSIF ( circ_error_RESTRICTED ) %]
(-)a/opac/sco/sco-main.pl (-8 / +2 lines)
Lines 114-124 if ( $patronid ) { Link Here
114
    $borrower = $patron->unblessed if $patron;
114
    $borrower = $patron->unblessed if $patron;
115
}
115
}
116
116
117
my $currencySymbol = "";
118
if ( my $active_currency = Koha::Acquisition::Currencies->get_active ) {
119
    $currencySymbol = $active_currency->symbol;
120
}
121
122
my $branch = $issuer->{branchcode};
117
my $branch = $issuer->{branchcode};
123
my $confirm_required = 0;
118
my $confirm_required = 0;
124
my $return_only = 0;
119
my $return_only = 0;
Lines 163-169 elsif ( $patron and $op eq "checkout" ) { Link Here
163
            hide_main                 => 1,
158
            hide_main                 => 1,
164
        );
159
        );
165
        if ($issue_error eq 'DEBT') {
160
        if ($issue_error eq 'DEBT') {
166
            $template->param(amount => $currencySymbol.$impossible->{DEBT});
161
            $template->param(DEBT => $impossible->{DEBT});
167
        }
162
        }
168
        #warn "issue_error: " . $issue_error ;
163
        #warn "issue_error: " . $issue_error ;
169
        if ( $issue_error eq "NO_MORE_RENEWALS" ) {
164
        if ( $issue_error eq "NO_MORE_RENEWALS" ) {
Lines 195-201 elsif ( $patron and $op eq "checkout" ) { Link Here
195
            hide_main                 => 1,
190
            hide_main                 => 1,
196
        );
191
        );
197
        if ($issue_error eq 'DEBT') {
192
        if ($issue_error eq 'DEBT') {
198
            $template->param(amount => $currencySymbol.$needconfirm->{DEBT});
193
            $template->param(DEBT => $needconfirm->{DEBT});
199
        }
194
        }
200
    } else {
195
    } else {
201
        if ( $confirmed || $issuenoconfirm ) {    # we'll want to call getpatroninfo again to get updated issues.
196
        if ( $confirmed || $issuenoconfirm ) {    # we'll want to call getpatroninfo again to get updated issues.
202
- 

Return to bug 12001