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 175-180 $(document).ready(function() { Link Here
175
176
176
                var content = "";
177
                var content = "";
177
                if ( data.renew_okay ) {
178
                if ( data.renew_okay ) {
179
                    issuesTable.api().ajax.reload();
178
                    content = __("Renewed, due:") + " " + data.date_due;
180
                    content = __("Renewed, due:") + " " + data.date_due;
179
                    $('#date_due_' + data.itemnumber).replaceWith( data.date_due );
181
                    $('#date_due_' + data.itemnumber).replaceWith( data.date_due );
180
                } else {
182
                } 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 112-118 my $sql = ' Link Here
112
        return_claims.id AS return_claim_id,
111
        return_claims.id AS return_claim_id,
113
        return_claims.notes AS return_claim_notes,
112
        return_claims.notes AS return_claim_notes,
114
        return_claims.created_on AS return_claim_created_on,
113
        return_claims.created_on AS return_claim_created_on,
115
        return_claims.updated_on AS return_claim_updated_on
114
        return_claims.updated_on AS return_claim_updated_on,
115
116
        acc.charge,
117
        acc.fine
116
118
117
    FROM issues
119
    FROM issues
118
        LEFT JOIN items USING ( itemnumber )
120
        LEFT JOIN items USING ( itemnumber )
Lines 121-129 my $sql = ' Link Here
121
        LEFT JOIN borrowers USING ( borrowernumber )
123
        LEFT JOIN borrowers USING ( borrowernumber )
122
        LEFT JOIN branches ON ( issues.branchcode = branches.branchcode )
124
        LEFT JOIN branches ON ( issues.branchcode = branches.branchcode )
123
        LEFT JOIN branches branches2 ON ( items.homebranch = branches2.branchcode )
125
        LEFT JOIN branches branches2 ON ( items.homebranch = branches2.branchcode )
124
        LEFT JOIN return_claims USING ( issue_id )
126
        LEFT JOIN return_claims USING ( issue_id, borrowernumber, itemnumber )
127
        LEFT OUTER JOIN (
128
            SELECT borrowernumber, itemnumber,
129
                   SUM(CASE WHEN debit_type_code LIKE 'RENT%' THEN amountoutstanding ELSE 0.00 END) AS charge,
130
                   SUM(CASE WHEN debit_type_code = 'OVERDUE' THEN amountoutstanding ELSE 0.00 END) AS fine
131
            FROM accountlines
132
            GROUP BY borrowernumber, itemnumber
133
        ) acc USING ( borrowernumber, itemnumber )
125
    WHERE issues.borrowernumber
134
    WHERE issues.borrowernumber
126
';
135
EOQ
127
136
128
if ( @borrowernumber == 1 ) {
137
if ( @borrowernumber == 1 ) {
129
    $sql .= '= ?';
138
    $sql .= '= ?';
Lines 148-156 my $itemtypes = { map { $_->{itemtype} => $_->{translated_description} } @{ Koha Link Here
148
my @checkouts_today;
157
my @checkouts_today;
149
my @checkouts_previous;
158
my @checkouts_previous;
150
while ( my $c = $sth->fetchrow_hashref() ) {
159
while ( my $c = $sth->fetchrow_hashref() ) {
151
    my ($charge) = GetIssuingCharges( $c->{itemnumber}, $c->{borrowernumber} );
152
    my $fine = GetFine( $c->{itemnumber}, $c->{borrowernumber} );
153
154
    my ( $can_renew, $can_renew_error ) =
160
    my ( $can_renew, $can_renew_error ) =
155
      CanBookBeRenewed( $c->{borrowernumber}, $c->{itemnumber} );
161
      CanBookBeRenewed( $c->{borrowernumber}, $c->{itemnumber} );
156
    my $can_renew_date =
162
    my $can_renew_date =
Lines 231-238 while ( my $c = $sth->fetchrow_hashref() ) { Link Here
231
        branchname           => $c->{branchname},
237
        branchname           => $c->{branchname},
232
        itemcallnumber       => $c->{itemcallnumber} || q{},
238
        itemcallnumber       => $c->{itemcallnumber} || q{},
233
        copynumber           => $c->{copynumber} || q{},
239
        copynumber           => $c->{copynumber} || q{},
234
        charge         => $charge,
240
        charge         => $c->{charge} || 0.00,
235
        fine           => $fine,
241
        fine           => $c->{fine}   || 0.00,
236
        price          => $c->{replacementprice} || q{},
242
        price          => $c->{replacementprice} || q{},
237
        can_renew      => $can_renew,
243
        can_renew      => $can_renew,
238
        can_renew_error     => $can_renew_error,
244
        can_renew_error     => $can_renew_error,
239
- 

Return to bug 14803