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

(-)a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js (+2 lines)
Lines 2-7 $(document).ready(function() { Link Here
2
    $.ajaxSetup ({ cache: false });
2
    $.ajaxSetup ({ cache: false });
3
3
4
    var barcodefield = $("#barcode");
4
    var barcodefield = $("#barcode");
5
    var issuesTable;
5
6
6
    // Handle the select all/none links for checkouts table columns
7
    // Handle the select all/none links for checkouts table columns
7
    $("#CheckAllRenewals").on("click",function(){
8
    $("#CheckAllRenewals").on("click",function(){
Lines 96-101 $(document).ready(function() { Link Here
96
97
97
                var content = "";
98
                var content = "";
98
                if ( data.renew_okay ) {
99
                if ( data.renew_okay ) {
100
                    issuesTable.api().ajax.reload();
99
                    content = CIRCULATION_RENEWED_DUE + " " + data.date_due;
101
                    content = CIRCULATION_RENEWED_DUE + " " + data.date_due;
100
                    $('#date_due_' + data.itemnumber).replaceWith( data.date_due );
102
                    $('#date_due_' + data.itemnumber).replaceWith( data.date_due );
101
                } else {
103
                } else {
(-)a/svc/checkouts (-6 / +11 lines)
Lines 25-31 use JSON qw(to_json); Link Here
25
25
26
use C4::Auth qw(check_cookie_auth haspermission get_session);
26
use C4::Auth qw(check_cookie_auth haspermission get_session);
27
use C4::Biblio qw(GetMarcBiblio GetFrameworkCode GetRecordValue );
27
use C4::Biblio qw(GetMarcBiblio GetFrameworkCode GetRecordValue );
28
use C4::Circulation qw(GetIssuingCharges CanBookBeRenewed GetRenewCount GetSoonestRenewDate);
28
use C4::Circulation qw(CanBookBeRenewed GetRenewCount GetSoonestRenewDate);
29
use C4::Koha qw(GetAuthorisedValueByCode);
29
use C4::Koha qw(GetAuthorisedValueByCode);
30
use C4::Overdues qw(GetFine);
30
use C4::Overdues qw(GetFine);
31
use C4::Context;
31
use C4::Context;
Lines 63-69 binmode STDOUT, ":encoding(UTF-8)"; Link Here
63
print $input->header( -type => 'text/plain', -charset => 'UTF-8' );
63
print $input->header( -type => 'text/plain', -charset => 'UTF-8' );
64
64
65
my @parameters;
65
my @parameters;
66
my $sql = '
66
my $sql = <<EOQ;
67
    SELECT
67
    SELECT
68
        issuedate,
68
        issuedate,
69
        date_due,
69
        date_due,
Lines 98-103 my $sql = ' Link Here
98
        damaged,
98
        damaged,
99
        location,
99
        location,
100
100
101
        acc.amountoutstanding,
102
101
        DATEDIFF( issuedate, CURRENT_DATE() ) AS not_issued_today
103
        DATEDIFF( issuedate, CURRENT_DATE() ) AS not_issued_today
102
    FROM issues
104
    FROM issues
103
        LEFT JOIN items USING ( itemnumber )
105
        LEFT JOIN items USING ( itemnumber )
Lines 105-112 my $sql = ' Link Here
105
        LEFT JOIN biblioitems USING ( biblionumber )
107
        LEFT JOIN biblioitems USING ( biblionumber )
106
        LEFT JOIN borrowers USING ( borrowernumber )
108
        LEFT JOIN borrowers USING ( borrowernumber )
107
        LEFT JOIN branches ON ( issues.branchcode = branches.branchcode )
109
        LEFT JOIN branches ON ( issues.branchcode = branches.branchcode )
110
        LEFT OUTER JOIN (
111
            SELECT borrowernumber, itemnumber, SUM(amountoutstanding) AS amountoutstanding
112
            FROM accountlines WHERE accounttype = 'Rent'
113
            GROUP BY borrowernumber, itemnumber
114
        ) acc USING ( borrowernumber, itemnumber )
108
    WHERE borrowernumber
115
    WHERE borrowernumber
109
';
116
EOQ
110
117
111
if ( @borrowernumber == 1 ) {
118
if ( @borrowernumber == 1 ) {
112
    $sql .= '= ?';
119
    $sql .= '= ?';
Lines 127-133 my $item_level_itypes = C4::Context->preference('item-level_itypes'); Link Here
127
my @checkouts_today;
134
my @checkouts_today;
128
my @checkouts_previous;
135
my @checkouts_previous;
129
while ( my $c = $sth->fetchrow_hashref() ) {
136
while ( my $c = $sth->fetchrow_hashref() ) {
130
    my ($charge) = GetIssuingCharges( $c->{itemnumber}, $c->{borrowernumber} );
131
    my $fine = GetFine( $c->{itemnumber}, $c->{borrowernumber} );
137
    my $fine = GetFine( $c->{itemnumber}, $c->{borrowernumber} );
132
138
133
    my ( $can_renew, $can_renew_error ) =
139
    my ( $can_renew, $can_renew_error ) =
Lines 159-165 while ( my $c = $sth->fetchrow_hashref() ) { Link Here
159
        branchcode           => $c->{branchcode},
165
        branchcode           => $c->{branchcode},
160
        branchname           => $c->{branchname},
166
        branchname           => $c->{branchname},
161
        itemcallnumber => $c->{itemcallnumber}   || q{},
167
        itemcallnumber => $c->{itemcallnumber}   || q{},
162
        charge         => $charge,
168
        charge         => $c->{amountoutstanding} || 0.00,
163
        fine           => $fine,
169
        fine           => $fine,
164
        price          => $c->{replacementprice} || q{},
170
        price          => $c->{replacementprice} || q{},
165
        can_renew      => $can_renew,
171
        can_renew      => $can_renew,
166
- 

Return to bug 14803