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

(-)a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js (+2 lines)
Lines 4-9 $(document).ready(function() { Link Here
4
    $.ajaxSetup ({ cache: false });
4
    $.ajaxSetup ({ cache: false });
5
5
6
    var barcodefield = $("#barcode");
6
    var barcodefield = $("#barcode");
7
    var issuesTable;
7
8
8
    var onHoldDueDateSet = false;
9
    var onHoldDueDateSet = false;
9
10
Lines 160-165 $(document).ready(function() { Link Here
160
161
161
                var content = "";
162
                var content = "";
162
                if ( data.renew_okay ) {
163
                if ( data.renew_okay ) {
164
                    issuesTable.api().ajax.reload();
163
                    content = CIRCULATION_RENEWED_DUE + " " + data.date_due;
165
                    content = CIRCULATION_RENEWED_DUE + " " + data.date_due;
164
                    $('#date_due_' + data.itemnumber).replaceWith( data.date_due );
166
                    $('#date_due_' + data.itemnumber).replaceWith( data.date_due );
165
                } else {
167
                } else {
(-)a/svc/checkouts (-12 / +17 lines)
Lines 23-30 use CGI; Link Here
23
use JSON qw(to_json);
23
use JSON qw(to_json);
24
24
25
use C4::Auth qw(check_cookie_auth haspermission get_session);
25
use C4::Auth qw(check_cookie_auth haspermission get_session);
26
use C4::Circulation qw(GetIssuingCharges CanBookBeRenewed GetRenewCount GetSoonestRenewDate);
26
use C4::Circulation qw(CanBookBeRenewed GetRenewCount GetSoonestRenewDate);
27
use C4::Overdues qw(GetFine);
28
use C4::Context;
27
use C4::Context;
29
28
30
use Koha::AuthorisedValues;
29
use Koha::AuthorisedValues;
Lines 62-68 binmode STDOUT, ":encoding(UTF-8)"; Link Here
62
print $input->header( -type => 'text/plain', -charset => 'UTF-8' );
61
print $input->header( -type => 'text/plain', -charset => 'UTF-8' );
63
62
64
my @parameters;
63
my @parameters;
65
my $sql = '
64
my $sql = <<EOQ;
66
    SELECT
65
    SELECT
67
        issues.issuedate,
66
        issues.issuedate,
68
        issues.date_due,
67
        issues.date_due,
Lines 110-116 my $sql = ' Link Here
110
        return_claims.id AS return_claim_id,
109
        return_claims.id AS return_claim_id,
111
        return_claims.notes AS return_claim_notes,
110
        return_claims.notes AS return_claim_notes,
112
        return_claims.created_on AS return_claim_created_on,
111
        return_claims.created_on AS return_claim_created_on,
113
        return_claims.updated_on AS return_claim_updated_on
112
        return_claims.updated_on AS return_claim_updated_on,
113
114
        acc.charge,
115
        acc.fine
114
116
115
    FROM issues
117
    FROM issues
116
        LEFT JOIN items USING ( itemnumber )
118
        LEFT JOIN items USING ( itemnumber )
Lines 119-127 my $sql = ' Link Here
119
        LEFT JOIN borrowers USING ( borrowernumber )
121
        LEFT JOIN borrowers USING ( borrowernumber )
120
        LEFT JOIN branches ON ( issues.branchcode = branches.branchcode )
122
        LEFT JOIN branches ON ( issues.branchcode = branches.branchcode )
121
        LEFT JOIN branches branches2 ON ( items.homebranch = branches2.branchcode )
123
        LEFT JOIN branches branches2 ON ( items.homebranch = branches2.branchcode )
122
        LEFT JOIN return_claims USING ( issue_id )
124
        LEFT JOIN return_claims USING ( issue_id, borrowernumber, itemnumber )
125
        LEFT OUTER JOIN (
126
            SELECT borrowernumber, itemnumber,
127
                   SUM(CASE WHEN debit_type_code LIKE 'RENT%' THEN amountoutstanding ELSE 0.00 END) AS charge,
128
                   SUM(CASE WHEN debit_type_code = 'OVERDUE' THEN amountoutstanding ELSE 0.00 END) AS fine
129
            FROM accountlines
130
            GROUP BY borrowernumber, itemnumber
131
        ) acc USING ( borrowernumber, itemnumber )
123
    WHERE issues.borrowernumber
132
    WHERE issues.borrowernumber
124
';
133
EOQ
125
134
126
if ( @borrowernumber == 1 ) {
135
if ( @borrowernumber == 1 ) {
127
    $sql .= '= ?';
136
    $sql .= '= ?';
Lines 143-151 my $claims_returned_lost_value = C4::Context->preference('ClaimReturnedLostValue Link Here
143
my @checkouts_today;
152
my @checkouts_today;
144
my @checkouts_previous;
153
my @checkouts_previous;
145
while ( my $c = $sth->fetchrow_hashref() ) {
154
while ( my $c = $sth->fetchrow_hashref() ) {
146
    my ($charge) = GetIssuingCharges( $c->{itemnumber}, $c->{borrowernumber} );
147
    my $fine = GetFine( $c->{itemnumber}, $c->{borrowernumber} );
148
149
    my ( $can_renew, $can_renew_error ) =
155
    my ( $can_renew, $can_renew_error ) =
150
      CanBookBeRenewed( $c->{borrowernumber}, $c->{itemnumber} );
156
      CanBookBeRenewed( $c->{borrowernumber}, $c->{itemnumber} );
151
    my $can_renew_date =
157
    my $can_renew_date =
Lines 207-214 while ( my $c = $sth->fetchrow_hashref() ) { Link Here
207
        branchcode           => $c->{branchcode},
213
        branchcode           => $c->{branchcode},
208
        branchname           => $c->{branchname},
214
        branchname           => $c->{branchname},
209
        itemcallnumber => $c->{itemcallnumber}   || q{},
215
        itemcallnumber => $c->{itemcallnumber}   || q{},
210
        charge         => $charge,
216
        charge         => $c->{charge} || 0.00,
211
        fine           => $fine,
217
        fine           => $c->{fine}   || 0.00,
212
        price          => $c->{replacementprice} || q{},
218
        price          => $c->{replacementprice} || q{},
213
        can_renew      => $can_renew,
219
        can_renew      => $can_renew,
214
        can_renew_error     => $can_renew_error,
220
        can_renew_error     => $can_renew_error,
215
- 

Return to bug 14803