Attachment #25105 for bug #11703

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




  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
);

__PACKAGE__->belongs_to(
  "item",
  "Koha::Schema::Result::Item",
  { itemnumber => "itemnumber" },
  {
    is_deferrable => 1,
    join_type     => "LEFT",
    on_delete     => "CASCADE",
    on_update     => "CASCADE",
  },
);

__PACKAGE__->belongs_to(
  "branch",
  "Koha::Schema::Result::Branch",
  { branchcode => "branchcode" },
  {
    is_deferrable => 1,
    join_type     => "LEFT",
    on_delete     => "CASCADE",
    on_update     => "CASCADE",
  },
);

1;




#!/usr/bin/perl

# Copyright 2014 ByWater Solutions
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with Koha; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

use Modern::Perl;

use CGI;
use JSON qw(to_json);

use C4::Circulation;
use C4::Items qw(GetBarcodeFromItemnumber);
use C4::Context;
use C4::Auth qw(check_cookie_auth);

use Koha::DateUtils qw(output_pref_due);

my $input = new CGI;

my ( $auth_status, $sessionID ) =
  check_cookie_auth( $input->cookie('CGISESSID'),
    { circulate => 'circulate_remaining_permissions' } );

if ( $auth_status ne "ok" ) {
    exit 0;
}

binmode STDOUT, ":encoding(UTF-8)";
print $input->header( -type => 'text/plain', -charset => 'UTF-8' );

my $itemnumber     = $input->param('itemnumber');
my $borrowernumber = $input->param('borrowernumber');
my $override_limit = $input->param('override_limit');
my $exempt_fine    = $input->param('exempt_fine');
my $branchcode     = $input->param('branchcode')
  || C4::Context->userenv->{'branch'};

my $barcode = GetBarcodeFromItemnumber($itemnumber);

my $data;
$data->{itemnumber}     = $itemnumber;
$data->{borrowernumber} = $borrowernumber;
$data->{branchcode}     = $branchcode;

if ( C4::Context->preference("InProcessingToShelvingCart") ) {
    my $item = GetItem($itemnumber);
    if ( $item->{'location'} eq 'PROC' ) {
        $item->{'location'} = 'CART';
        ModItem( $item, $item->{'biblionumber'}, $item->{'itemnumber'} );
    }
}

if ( C4::Context->preference("ReturnToShelvingCart") ) {
    my $item = GetItem($itemnumber);
    $item->{'location'} = 'CART';
    ModItem( $item, $item->{'biblionumber'}, $item->{'itemnumber'} );
}

( $data->{returned} ) = AddReturn( $barcode, $branchcode, $exempt_fine );

print to_json($data);




#!/usr/bin/perl

# This software is placed under the gnu General Public License, v2 (http://www.gnu.org/licenses/gpl.html)

# Copyright 2014 ByWater Solutions
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 3 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with Koha; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

use Modern::Perl;

use CGI;
use JSON qw(to_json);

use C4::Context;
use C4::Charset;
use C4::Auth qw(check_cookie_auth);
use C4::Circulation qw(GetIssuingCharges CanBookBeRenewed GetRenewCount);

use Koha::Database;
use Koha::DateUtils;

my $input = new CGI;

my ( $auth_status, $sessionID ) =
  check_cookie_auth( $input->cookie('CGISESSID'),
    { circulate => 'circulate_remaining_permissions' } );

if ( $auth_status ne "ok" ) {
    exit 0;
}

my $schema = Koha::Database->new()->schema();

my @sort_columns = qw/date_due title itype issuedate branchcode itemcallnumber/;

my $borrowernumber    = $input->param('borrowernumber');
my $offset            = $input->param('iDisplayStart');
my $results_per_page  = $input->param('iDisplayLength');
my $sorting_column    = $sort_columns[ $input->param('iSortCol_0') ];
my $sorting_direction = $input->param('sSortDir_0');

$results_per_page = undef if ( $results_per_page == -1 );

binmode STDOUT, ":encoding(UTF-8)";
print $input->header( -type => 'text/plain', -charset => 'UTF-8' );

my $checkouts_rs =
  $schema->resultset('Issue')->search( { borrowernumber => $borrowernumber },
    { prefetch => { 'item' => 'biblio' }, orderby => 'issuedate' } );

my @checkouts;
while ( my $c = $checkouts_rs->next() ) {
    my $itemnumber = $c->itemnumber()->itemnumber();

    my ($charge) = GetIssuingCharges(
        $c->itemnumber()->itemnumber(),
        $c->borrowernumber()->borrowernumber()
    );

    my ( $can_renew, $can_renew_error ) =
      CanBookBeRenewed( $borrowernumber, $itemnumber );

    my ( $renewals_count, $renewals_allowed, $renewals_remaining ) =
      GetRenewCount( $borrowernumber, $itemnumber );

    push(
        @checkouts,
        {
            DT_RowId           => "$itemnumber-$borrowernumber",
            title              => $c->item()->biblio()->title(),
            author             => $c->item()->biblio()->author(),
            barcode            => $c->item()->barcode(),
            itemtype           => $c->item()->effective_itemtype(),
            branchcode         => $c->branchcode(),
            branchname         => $c->branch->branchname(),
            itemcallnumber     => $c->item()->itemcallnumber() || q{},
            charge             => $charge,
            price              => $c->item->replacementprice() || q{},
            can_renew          => $can_renew,
            can_renew_error    => $can_renew_error,
            itemnumber         => $itemnumber,
            borrowernumber     => $borrowernumber,
            biblionumber       => $c->item()->biblio()->biblionumber,
            issuedate          => $c->issuedate(),
            date_due           => $c->date_due(),
            renewals_count     => $renewals_count,
            renewals_allowed   => $renewals_allowed,
            renewals_remaining => $renewals_remaining,
            issuedate_formatted =>
              output_pref( dt_from_string( $c->issuedate() ) ),
            date_due_formatted =>
              output_pref_due( dt_from_string( $c->date_due() ) ),
        }
    );
}

my $data;
$data->{'iTotalRecords'}        = scalar @checkouts;                 #FIXME
$data->{'iTotalDisplayRecords'} = scalar @checkouts;
$data->{'sEcho'}                = $input->param('sEcho') || undef;
$data->{'aaData'}               = \@checkouts;

print to_json($data);




#!/usr/bin/perl

# Copyright 2014 ByWater Solutions
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with Koha; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

use Modern::Perl;

use CGI;
use JSON qw(to_json);

use C4::Circulation;
use C4::Context;
use C4::Auth qw(check_cookie_auth);

use Koha::DateUtils qw(output_pref_due);

my $input = new CGI;

my ( $auth_status, $sessionID ) =
  check_cookie_auth( $input->cookie('CGISESSID'),
    { circulate => 'circulate_remaining_permissions' } );

if ( $auth_status ne "ok" ) {
    exit 0;
}

binmode STDOUT, ":encoding(UTF-8)";
print $input->header( -type => 'text/plain', -charset => 'UTF-8' );

my $itemnumber     = $input->param('itemnumber');
my $borrowernumber = $input->param('borrowernumber');
my $override_limit = $input->param('override_limit');
my $branchcode     = $input->param('branchcode')
  || C4::Context->userenv->{'branch'};

my $data;
$data->{itemnumber} = $itemnumber;
$data->{borrowernumber} = $borrowernumber;
$data->{branchcode} = $branchcode;

( $data->{renew_okay}, $data->{error} ) =
  CanBookBeRenewed( $borrowernumber, $itemnumber, $override_limit );

if ( $data->{renew_okay} ) {
    my $date_due = AddRenewal( $borrowernumber, $itemnumber, $branchcode );
    $data->{date_due} = output_pref_due( $date_due );
}

print to_json($data);





my $branches = GetBranches();

my @failedrenews = $query->param('failedrenew');    # expected to be itemnumbers 
our %renew_failed = ();
for (@failedrenews) { $renew_failed{$_} = 1; }

my @failedreturns = $query->param('failedreturn');
our %return_failed = ();
for (@failedreturns) { $return_failed{$_} = 1; }

my $findborrower = $query->param('findborrower') || q{};
$findborrower =~ s|,| |g;
my $borrowernumber = $query->param('borrowernumber');

our @relprevissues  = ();
my $displayrelissues;

our $totalprice = 0;

sub build_issue_data {
    my $issueslist = shift;
    my $relatives = shift;

    # split in 2 arrays for today & previous
    foreach my $it ( @$issueslist ) {
        my $itemtypeinfo = getitemtypeinfo( (C4::Context->preference('item-level_itypes')) ? $it->{'itype'} : $it->{'itemtype'} );

        # set itemtype per item-level_itype syspref - FIXME this is an ugly hack
        $it->{'itemtype'} = ( C4::Context->preference( 'item-level_itypes' ) ) ? $it->{'itype'} : $it->{'itemtype'};

        ($it->{'charge'}, $it->{'itemtype_charge'}) = GetIssuingCharges(
            $it->{'itemnumber'}, $it->{'borrowernumber'}
        );
        $it->{'charge'} = sprintf("%.2f", $it->{'charge'});
        my ($can_renew, $can_renew_error) = CanBookBeRenewed( 
            $it->{'borrowernumber'},$it->{'itemnumber'}
        );
        $it->{"renew_error_${can_renew_error}"} = 1 if defined $can_renew_error;
        my $restype = C4::Reserves::GetReserveStatus( $it->{'itemnumber'} );
        $it->{'can_renew'} = $can_renew;
        $it->{'can_confirm'} = !$can_renew && !$restype;
        $it->{'renew_error'} = ( $restype eq "Waiting" or $restype eq "Reserved" ) ? 1 : 0;
        $it->{'checkoutdate'} = C4::Dates->new($it->{'issuedate'},'iso')->output('syspref');
        $it->{'issuingbranchname'} = GetBranchName($it->{'branchcode'});

        $totalprice += $it->{'replacementprice'} || 0;
        $it->{'itemtype'} = $itemtypeinfo->{'description'};
        $it->{'itemtype_image'} = $itemtypeinfo->{'imageurl'};
        $it->{'dd_sort'} = $it->{'date_due'};
        $it->{'dd'} = output_pref($it->{'date_due'});
        $it->{'displaydate_sort'} = $it->{'issuedate'};
        $it->{'displaydate'} = output_pref($it->{'issuedate'});
        #$it->{'od'} = ( $it->{'date_due'} lt $todaysdate ) ? 1 : 0 ;
        $it->{'od'} = $it->{'overdue'};
        $it->{'subtitle'} = GetRecordValue('subtitle', GetMarcBiblio($it->{biblionumber}), GetFrameworkCode($it->{biblionumber}));
        $it->{'renew_failed'} = $renew_failed{$it->{'itemnumber'}};
        $it->{'return_failed'} = $return_failed{$it->{'barcode'}};

        if ( ( $it->{'issuedate'} && $it->{'issuedate'} gt $todaysdate )
          || ( $it->{'lastreneweddate'} && $it->{'lastreneweddate'} gt $todaysdate ) ) {
            (!$relatives) ? push @todaysissues, $it : push @relissues, $it;
        } else {
            (!$relatives) ? push @previousissues, $it : push @relprevissues, $it;
        }
        ($it->{'renewcount'},$it->{'renewsallowed'},$it->{'renewsleft'}) = C4::Circulation::GetRenewCount($it->{'borrowernumber'},$it->{'itemnumber'}); #Add renewal count to item data display
    }
}

if ($borrower) {

    # Getting borrower relatives
    my @relborrowernumbers = GetMemberRelatives($borrower->{'borrowernumber'});
    #push @borrowernumbers, $borrower->{'borrowernumber'};

    # get each issue of the borrower & separate them in todayissues & previous issues
    my $issueslist = GetPendingIssues($borrower->{'borrowernumber'});
    my $relissueslist = [];
    if ( @relborrowernumbers ) {
        $relissueslist = GetPendingIssues(@relborrowernumbers);
    }

    build_issue_data($issueslist, 0);
    build_issue_data($relissueslist, 1);
  
    $displayrelissues = scalar($relissueslist);

    if ( C4::Context->preference( "todaysIssuesDefaultSortOrder" ) eq 'asc' ) {
        @todaysissues   = sort { $a->{'timestamp'} cmp $b->{'timestamp'} } @todaysissues;
    }
    else {
        @todaysissues   = sort { $b->{'timestamp'} cmp $a->{'timestamp'} } @todaysissues;
    }

    if ( C4::Context->preference( "previousIssuesDefaultSortOrder" ) eq 'asc' ){
        @previousissues = sort { $a->{'date_due'} cmp $b->{'date_due'} } @previousissues;
    }
    else {
        @previousissues = sort { $b->{'date_due'} cmp $a->{'date_due'} } @previousissues;
    }
}


my @values;
my %labels;
my $CGIselectborrower;

    duedatespec       => $duedatespec,
    message           => $message,
    CGIselectborrower => $CGIselectborrower,
    totalprice        => sprintf('%.2f', $totalprice),
    totaldue          => sprintf('%.2f', $total),
    todayissues       => \@todaysissues,
    previssues        => \@previousissues,

Lines 270-276 tr.even td, tr.even.highlight td { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css (-1 / +1 lines)
270	border-right : 1px solid #BCBCBC;	270	border-right : 1px solid #BCBCBC;
271	}	271	}
272		272
273	td.od {	273	.overdue td.od {
274	color : #cc0000;	274	color : #cc0000;
275	font-weight : bold;	275	font-weight : bold;
276	}	276	}




$(document).ready(function() {
    // Handle the select all/none links for checkouts table columns
    $("#CheckAllRenewals").on("click",function(){
        $("#UncheckAllCheckins").click();
        $(".renew:visible").attr("checked", "checked" );
        return false;
    });
    $("#CheckAllitems").on("click",function(){
        allcheckboxes.checkCheckboxes(":input[name*=items]");
        allcheckboxes.unCheckCheckboxes(":input[name*=barcodes]"); return false;
    });
    $("#UncheckAllRenewals").on("click",function(){
        $(".renew:visible").removeAttr("checked");
        return false;
    });

    $("#CheckAllCheckins").on("click",function(){
        $("#UncheckAllRenewals").click();
        $(".checkin:visible").attr("checked", "checked" );
        return false;
    });
    $("#UncheckAllCheckins").on("click",function(){
        $(".checkin:visible").removeAttr("checked");
        return false;
    });

    $("#CheckAllExports").on("click",function(){
        $(".export:visible").attr("checked", "checked" );
        return false;
    });
    $("#UncheckAllExports").on("click",function(){
        $(".export:visible").removeAttr("checked");
        return false;
    });

    // Don't allow both return and renew checkboxes to be checked
    $(document).on("change", '.renew', function(){
        if ( $(this).is(":checked") ) {
            $( "#checkin_" + $(this).val() ).removeAttr("checked");
        }
        allcheckboxes.checkCheckboxes(":input[name*=items]");
        allcheckboxes.unCheckCheckboxes(":input[name*=barcodes]"); return false;
    });
    $(document).on("change", '.checkin', function(){
        if ( $(this).is(":checked") ) {
            $( "#renew_" + $(this).val() ).removeAttr("checked");
        }
    });

    // Handle renewals
    $("#RenewCheckinChecked").on("click",function(){
        $(".checkin:checked:visible").each(function() {
            itemnumber = $(this).val();

            $(this).replaceWith("<img id='checkin_" + itemnumber + "' src='" + interface + "/" + theme + "/img/loading-small.gif' />");       

            params = { 
                itemnumber: itemnumber, 
                borrowernumber: borrowernumber,
                branchcode: branchcode
            };

            $.post( "/cgi-bin/koha/api/checkin.pl", params, function( data ) {
                id = "#checkin_" + data.itemnumber;

                content = "";
                if ( data.returned ) {
                    content = _("Returned");
                } else {
                    content = _("Unable to return");
                }
                    
                $(id).replaceWith( content );
            }, "json")
        });

        $(".renew:checked:visible").each(function() {
            var override_limit = $("#override_limit").is(':checked') ? 1 : 0;

            var itemnumber = $(this).val();

            $(this).replaceWith("<img id='renew_" + itemnumber + "' src='" + interface + "/" + theme + "/img/loading-small.gif' />");       

            var params = { 
                itemnumber: itemnumber, 
                borrowernumber: borrowernumber,
                branchcode: branchcode,
                override_limit: override_limit
            };

            $.post( "/cgi-bin/koha/api/renew.pl", params, function( data ) {
                var id = "#renew_" + data.itemnumber;

                var content = "";
                if ( data.renew_okay ) {
                    content = _("Renewed, due: ") + data.date_due;
                } else {
                    content = _("Renew failed: ");
                    if ( data.error == "no_checkout" ) {
                        content += _("not checked out");
                    } else if ( data.error == "too_many" ) {
                        content += _("too many renewals");
                    } else if ( data.error == "on_reserve" ) {
                        content += _("on reserve");
                    } else if ( data.error ) {
                        content += data.error;
                    } else {
                        content += _("reason unknown");
                    }
                }
                    
                $(id).replaceWith( content );
            }, "json")
        });
    });

    $("#RenewAll").on("click",function(){
        $("#CheckAllRenewals").click();
        $("#UncheckAllCheckins").click();
        $("#RenewCheckinChecked").click();
    });

    $('#patronlists').tabs();

    $("#messages ul").after("<a href=\"#\" id=\"addmessage\">"+MSG_ADD_MESSAGE+"</a>");

    $("#borrower_messages .cancel").on("click",function(){
        $("#add_message_form").hide();
        $("#addmessage").show();
    });

    $("#addmessage").on("click",function(){
        $(this).hide();
        $("#add_message_form").show();

        return false;
    });
    // Clicking the table cell checks the checkbox inside it
    $(document).on("click", 'td', function(e){
        if(e.target.tagName.toLowerCase() == 'td'){
          $(this).find("input:checkbox:visible").each( function() {
            $(this).click();




</title>
[% INCLUDE 'doc-head-close.inc' %]
[% INCLUDE 'calendar.inc' %]
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
[% INCLUDE 'datatables-strings.inc' %]
<!-- <script type="text/javascript" src="[% themelang %]/js/datatables.js"></script> -->
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery-ui-timepicker-addon.js"></script>
<script type="text/javascript" src="[% themelang %]/js/pages/circulation.js"></script>
<script type="text/javascript">
//<![CDATA[
/* Set some variable needed in circulation.js */
var interface = "[% interface %]";
var theme = "[% theme %]";
var borrowernumber = "[% borrowernumber %]";
var branchcode = "[% branch %]";

var MSG_ADD_MESSAGE = _("Add a new message");
var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");
[% IF ( UseTablesortForCirc && dateformat == 'metric' ) %]dt_add_type_uk_date();[% END %]

                }
            }
        }[% END %]);

        $("#issues-table").dataTable(/*$.extend(true, {}, dataTablesDefaults, */{
            "sDom": "<'row-fluid'<'span6'><'span6'>r>t<'row-fluid'>t",
            "aaSorting": [],
            "aoColumnDefs": [
                { "aTargets": [ -1, -2[% IF ( exports_enabled ) %], -3[% END %] ], "bSortable": false, "bSearchable": false }
            ],
            "aoColumns": [
                { 
                    "mDataProp": function( oObj ) {
                        var today = new Date();
                        var due = new Date( oObj.date_due );
                        if ( today > due ) {
                            return "<span class='overdue'>" + oObj.date_due_formatted + "</span>"; 
                        } else {
                            return oObj.date_due_formatted;
                        }
                    }
                },
                { 
                    "mDataProp": function ( oObj ) {
                        title = "<a href='/cgi-bin/koha/catalogue/detail.pl?biblionumber=" 
                              + oObj.biblionumber 
                              + "'>" 
                              + oObj.title 
                              + "</a>";

                        if ( oObj.author ) {
                            title += " " + _("by") + " " + oObj.author;
                        }

                        title += " " 
                              + "<a href='/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=" 
                              + oObj.biblionumber 
                              + "&itemnumber=" 
                              + oObj.itemnumber 
                              + "#" 
                              + oObj.itemnumber 
                              + "'>" 
                              + oObj.barcode 
                              + "</a>";

                        return title;
                    }
                },
                { "mDataProp": "itemtype" },
                { "mDataProp": "issuedate" },
                { "mDataProp": "branchname" },
                { "mDataProp": "itemcallnumber" },
                { "mDataProp": "charge" },
                { "mDataProp": "price" },
                { 
                    "bSortable": false,
                    "mDataProp": function ( oObj ) {
                        var content = "";
                        var span_style = "";
                        var span_class = "";

                        content += "<span style='padding: 0 1em;'>" + oObj.renewals_count + "</span>";

                        if ( oObj.can_renew ) {
                            // Do nothing 
                        } else if ( oObj.can_renew_error == "on_reserve" ) {
                            content += "<span class='renewals-disabled'>"
                                    + "<a href='/cgi-bin/koha/reserve/request.pl?biblionumber=" + oObj.biblionumber + "'>" + _("On hold") + "</a>"
                                    + "</span>";

                            span_style = "display: none";
                            span_class = "renewals-allowed";
                        } else if ( oObj.can_renew_error == "too_many" ) {
                            content += "<span class='renewals-disabled'>"
                                    + _("Not renewable")
                                    + "</span>";

                            span_style = "display: none";
                            span_class = "renewals-allowed";
                        } else {
                            content += "<span class='renewals-disabled'>" 
                                    + oObj.can_renew_error 
                                    + "</span>";

                            span_style = "display: none";
                            span_class = "renewals-allowed";
                        }

                        content += "<span class='" + span_class + "' style='" + span_style + "'>"
                                +  "<input type='checkbox' class='renew' id='renew_" + oObj.itemnumber + "' name='renew' value='" + oObj.itemnumber +"'/>"
                                +  "</span>";

                        if ( oObj.renewals_remaining ) {
                            content += "<span class='renewals'>(" 
                                    + oObj.renewals_remaining 
                                    + " " + _("of") + " " 
                                    + oObj.renewals_allowed + " " 
                                    + _("renewals remaining") + ")</span>"
                        }


                        return content;
                    }
                },
                { 
                    "bSortable": false,
                    "mDataProp": function ( oObj ) {
                        if ( oObj.can_renew_error == "on_reserve" ) {
                            return "<a href='/cgi-bin/koha/reserve/request.pl?biblionumber=" + oObj.biblionumber + "'>" + _("On hold") + "</a>";
                        } else {
                            return "<input type='checkbox' class='checkin' id='checkin_" + oObj.itemnumber + "' name='checkin' value='" + oObj.itemnumber +"'></input>";
                        }
                    }
                },
                {
                    "bSortable": false,
                    "mDataProp": function ( oObj ) {
                        return "<input type='checkbox' class='export' id='export_" + oObj.biblionumber + "' name='biblionumbers' value='" + oObj.biblionumber + "' />";
                    }
                }
            ],
            "bPaginate": false,
            "bProcessing": true,
            "bServerSide": true,
            "sAjaxSource": '/cgi-bin/koha/api/checkouts.pl',
            "fnServerData": function ( sSource, aoData, fnCallback ) {
                aoData.push( { "name": "borrowernumber", "value": "[% borrowernumber %]" } );

                $.getJSON( sSource, aoData, function (json) {
                    fnCallback(json)
                } );
            },
        }/*)*/);

[%#
        $("#relissuest").dataTable($.extend(true, {}, dataTablesDefaults, {
            "sDom": 't',
            "aaSorting": [],

            ],
            "bPaginate": false
        }));
%]

        $("#issues-table").on("sort",function() {
            $("#previous").hide();  // Don't want to see "previous checkouts" header sorted with other rows
        });
        $("#relissuest").on("sort",function() {
            $("#relprevious").hide();  // Don't want to see "previous checkouts" header sorted with other rows
        });

        [% IF ( AllowRenewalLimitOverride ) %]
            $( '#override_limit' ).click( function () {
                if ( this.checked ) {
                    $( '.renewals-allowed' ).show(); $( '.renewals-disabled' ).hide();
                } else {
                    $( '.renewals-allowed' ).hide(); $( '.renewals-disabled' ).show();
                }
            } ).attr( 'checked', false );
        [% END %]
            
        [% IF !( CircAutoPrintQuickSlip == 'clear' ) %]
            // listen submit to trigger qslip on empty checkout
            $('#mainform').bind('submit',function() {
                if ($('#barcode').val() == '') {
                    return printx_window( '[% CircAutoPrintQuickSlip %]' ); 
                }
            });
        [% END %]

    [% IF ( CAN_user_circulate_override_renewals ) %]
    [% IF ( AllowRenewalLimitOverride ) %]

<!-- SUMMARY : TODAY & PREVIOUS ISSUES -->
<div id="checkouts">
[% IF ( issuecount ) %]
    <table id="issues-table">
        <thead>
            <tr>
                <th scope="col">Due date</th>
                <th scope="col">Title</th>
                <th scope="col">Item type</th>
                <th scope="col">Checked out on</th>
                <th scope="col">Checked out from</th>
                <th scope="col">Call no</th>
                <th scope="col">Charge</th>
                <th scope="col">Price</th>
                <th scope="col">Renew <p class="column-tool"><a href="#" id="CheckAllRenewals">select all</a> | <a href="#" id="UncheckAllRenewals">none</a></p></th>
                <th scope="col">Check in <p class="column-tool"><a href="#" id="CheckAllCheckins">select all</a> | <a href="#" id="UncheckAllCheckins">none</a></p></th>
                <th scope="col">Export <p class="column-tool"><a href="#" id="CheckAllExports">select all</a> | <a href="#" id="UncheckAllExports">none</a></p></th>
            </tr>
        </thead>
    </table>
        [% IF ( exports_enabled ) %]
          <th scope="col">Export <p class="column-tool"><a href="#" id="CheckAllexports">select all</a> | <a href="#" id="CheckNoexports">none</a></p></th>
        [% END %]
    </tr></thead>
[% IF ( todayissues ) %]
[% INCLUDE 'checkouts-table-footer.inc' %]
	<tbody>

    [% FOREACH todayissue IN todayissues %]
    [% IF ( loop.odd ) %]
    <tr>
    [% ELSE %]
    <tr class="highlight">
    [% END %]
        [% IF ( todayissue.od ) %]<td class="od">[% ELSE %]<td>[% END %]
        <span title="[% todayissue.dd_sort %]">[% todayissue.dd %]</span>

    [% IF ( issuecount ) %]
        <fieldset class="action">
            [% IF ( CAN_user_circulate_override_renewals ) %]
                [% IF ( AllowRenewalLimitOverride ) %]
                    <label for="override_limit">Override renewal limit:</label>
                    <input type="checkbox" name="override_limit" id="override_limit" value="1" />
        </td>
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% todayissue.biblionumber %]&amp;type=intra"><strong>[% todayissue.title |html %][% FOREACH subtitl IN todayissue.subtitle %] [% subtitl.subfield %][% END %]</strong></a>[% IF ( todayissue.author ) %], by [% todayissue.author %][% END %][% IF ( todayissue.itemnotes ) %]- <span class="circ-hlt">[% todayissue.itemnotes %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% todayissue.biblionumber %]&amp;itemnumber=[% todayissue.itemnumber %]#item[% todayissue.itemnumber %]">[% todayissue.barcode %]</a></td>
        <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( todayissue.itemtype_image ) %]<img src="[% todayissue.itemtype_image %]" alt="" />[% END %][% END %][% todayissue.itemtype %]</td>
        <td><span title="[% todayissue.displaydate_sort %]">[% todayissue.checkoutdate %]</span></td>
        [% IF ( todayissue.multiple_borrowers ) %]<td>[% todayissue.firstname %] [% todayissue.surname %]</td>[% END %]
        <td>[% todayissue.issuingbranchname %]</td>
        <td>[% todayissue.itemcallnumber %]</td>
            <td>[% todayissue.charge %]</td>
            <td>[% todayissue.replacementprice %]</td>
      [% IF ( todayissue.renew_failed ) %]
            <td class="problem">Renewal failed</td>
      [% ELSE %]
        <td><span style="padding: 0 1em;">[% IF ( todayissue.renewals ) %][% todayissue.renewals %][% ELSE %]0[% END %]</span>
        [% IF ( todayissue.can_renew ) %]
        <input type="checkbox" name="all_items[]" value="[% todayissue.itemnumber %]" checked="checked" style="display: none;" />
        [% IF ( todayissue.od ) %]
            <input type="checkbox" class="radio" name="items[]" value="[% todayissue.itemnumber %]" checked="checked" />
        [% ELSE %]
            <input type="checkbox" class="radio" name="items[]" value="[% todayissue.itemnumber %]" />
        [% END %]
            [% IF todayissue.renewsallowed && todayissue.renewsleft %]
                <span class="renewals">([% todayissue.renewsleft %] of [% todayissue.renewsallowed %] renewals remaining)</span>
            [% END %]
        [% ELSE %]
            [% IF ( todayissue.can_confirm ) %]<span class="renewals-allowed" style="display: none">
                <input type="checkbox" name="all_items[]" value="[% todayissue.itemnumber %]" checked="checked" style="display: none;" />
                [% IF ( todayissue.od ) %]
                    <input type="checkbox" class="radio" name="items[]" value="[% todayissue.itemnumber %]" checked="checked" />
                [% ELSE %]
                    <input type="checkbox" class="radio" name="items[]" value="[% todayissue.itemnumber %]" />
                [% END %]
                </span>
                [% IF todayissue.renewsallowed && todayissue.renewsleft %]
                    <span class="renewals">([% todayissue.renewsleft %] of [% todayissue.renewsallowed %] renewals remaining)</span>
                [% END %]
                <span class="renewals-disabled">
            [% END %]
		[% IF ( todayissue.renew_error_on_reserve ) %]
            <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% todayissue.biblionumber %]">On hold</a>
		[% END %]
                [% IF ( todayissue.renew_error_too_many ) %]
            Not renewable
                [% END %]
            [% IF ( todayissue.can_confirm ) %]
                </span>
            [% END %]
            <button class="btn" id="RenewCheckinChecked"><i class="icon-book"></i> Renew or Return checked items</button>
            <button class="btn" id="RenewAll"><i class="icon-book"></i> Renew all</button>
        </fieldset>
        [% IF ( todayissue.return_failed ) %]
            <td class="problem">Checkin failed</td>
        [% ELSE %]
            [% IF ( todayissue.renew_error_on_reserve ) %]
               <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% todayissue.biblionumber %]">On hold</a>
                <input type="checkbox" name="all_barcodes[]" value="[% todayissue.barcode %]" checked="checked" style="display: none;" />
                </td>
            [% ELSE %]
            <td><input type="checkbox" class="radio" name="barcodes[]"  value="[% todayissue.barcode %]" />
                <input type="checkbox" name="all_barcodes[]" value="[% todayissue.barcode %]" checked="checked" style="display: none;" />
            </td>
            [% END %]
        [% END %]
        [% IF ( exports_enabled ) %]
          <td style="text-align:center;">
            <input type="checkbox" id="export_[% todayissue.biblionumber %]" name="biblionumbers" value="[% todayissue.biblionumber %]" />
            <input type="checkbox" name="itemnumbers" value="[% todayissue.itemnumber %]" style="visibility:hidden;" />
          </td>
        [% END %]
    </tr>
    [% END %] <!-- /loop todayissues -->
    <!-- /if todayissues -->[% END %]

[% IF ( previssues ) %]
    [% UNLESS ( todayissues ) %]
    [% INCLUDE 'checkouts-table-footer.inc' %]
        <tbody>
    [% END %]
    [% IF ( UseTablesortForCirc ) %]<tr id="previous"><th><span title="">Previous checkouts</span></th><th></th><th></th><th><span title=""></span></th><th></th><th></th><th></th><th></th><th></th><th></th>[% IF ( exports_enabled ) %]<th></th>[% END %]</tr>[% ELSE %]<tr id="previous">[% IF ( exports_enabled ) %]<th colspan="11">[% ELSE %]<th colspan="10">[% END %]Previous checkouts</th></tr>[% END %]
    [% FOREACH previssue IN previssues %]
    [% IF ( loop.odd ) %]
        <tr>
    [% ELSE %]
        <tr class="highlight">
    [% END %]
        [% IF ( previssue.od ) %]<td class="od">[% ELSE %]<td>[% END %]
        <span title="[% previssue.dd_sort %]">[% previssue.dd %]</span>

            [% IF ( previssue.itemlost ) %]
                <span class="lost">[% AuthorisedValues.GetByCode( 'LOST', previssue.itemlost ) %]</span>
            [% END %]
            [% IF ( previssue.damaged ) %]
                <span class="dmg">[% AuthorisedValues.GetByCode( 'DAMAGED', previssue.damaged ) %]</span>
            [% END %]
        </td>
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% previssue.biblionumber %]&amp;type=intra"><strong>[% previssue.title |html %][% FOREACH subtitl IN previssue.subtitle %] [% subtitl.subfield %][% END %]</strong></a>[% IF ( previssue.author ) %], by [% previssue.author %][% END %] [% IF ( previssue.itemnotes ) %]- [% previssue.itemnotes %][% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% previssue.biblionumber %]&amp;itemnumber=[% previssue.itemnumber %]#item[% previssue.itemnumber %]">[% previssue.barcode %]</a></td>
        <td>
            [% previssue.itemtype %]
        </td>
        <td><span title="[% previssue.displaydate_sort %]">[% previssue.displaydate %]</span></td>
        [% IF ( previssue.multiple_borrowers ) %]<td>[% previssue.firstname %] [% previssue.surname %]</td>[% END %]
        <td>[% previssue.issuingbranchname %]</td>
        <td>[% previssue.itemcallnumber %]</td>
        <td>[% previssue.charge %]</td>
        <td>[% previssue.replacementprice %]</td>
      [% IF ( previssue.renew_failed ) %]
            <td class="problem">Renewal failed</td>
      [% ELSE %]
        <td><span style="padding: 0 1em;">[% IF ( previssue.renewals ) %][% previssue.renewals %][% ELSE %]0[% END %]</span>
        [% IF ( previssue.can_renew ) %]
        <input type="checkbox" name="all_items[]" value="[% previssue.itemnumber %]" checked="checked" style="display: none;" />
        [% IF ( previssue.od ) %]
            <input type="checkbox" class="radio" name="items[]" value="[% previssue.itemnumber %]" checked="checked" />
        [% ELSE %]
            <input type="checkbox" class="radio" name="items[]" value="[% previssue.itemnumber %]" />
        [% END %]
            [% IF previssue.renewsallowed && previssue.renewsleft %]
                <span class="renewals">([% previssue.renewsleft %] of [% previssue.renewsallowed %] renewals remaining)</span>
            [% END %]
        [% ELSE %]
            [% IF ( previssue.can_confirm ) %]<span class="renewals-allowed" style="display: none">
                <input type="checkbox" name="all_items[]" value="[% previssue.itemnumber %]" checked="checked" style="display: none;" />
                [% IF ( previssue.od ) %]
                    <input type="checkbox" class="radio" name="items[]" value="[% previssue.itemnumber %]" checked="checked" />
                [% ELSE %]
                    <input type="checkbox" class="radio" name="items[]" value="[% previssue.itemnumber %]" />
                [% END %]
                </span>
                [% IF previssue.renewsallowed && previssue.renewsleft %]
                    <span class="renewals">([% previssue.renewsleft %] of [% previssue.renewsallowed %] renewals remaining)</span>
                [% END %]
                <span class="renewals-disabled">
            [% END %]
		[% IF ( previssue.renew_error_on_reserve ) %]
            <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% previssue.biblionumber %]">On hold</a>
		[% END %]
                [% IF ( previssue.renew_error_too_many ) %]
            Not renewable
                [% END %]
            [% IF ( previssue.can_confirm ) %]
                </span>
            [% END %]
        [% END %]
        </td>
        [% END %]
		  [% IF ( previssue.return_failed ) %]
            <td class="problem">Check-in failed</td>
        [% ELSE %]
            [% IF ( previssue.renew_error_on_reserve ) %]
               <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% previssue.biblionumber %]">On hold</a>
                <input type="checkbox" name="all_barcodes[]" value="[% previssue.barcode %]" checked="checked" style="display: none;" />
                </td>
            [% ELSE %]
            <td><input type="checkbox" class="radio" name="barcodes[]"  value="[% previssue.barcode %]" />
                <input type="checkbox" name="all_barcodes[]" value="[% previssue.barcode %]" checked="checked" style="display: none;" />
            </td>
            [% END %]
        [% END %]
        [% IF ( exports_enabled ) %]
          <td style="text-align:center;">
            <input type="checkbox" id="export_[% previssue.biblionumber %]" name="biblionumbers" value="[% previssue.biblionumber %]" />
            <input type="checkbox" name="itemnumbers" value="[% previssue.itemnumber %]" style="visibility:hidden;" />
          </td>
        [% END %]
    </tr>
    <!-- /loop previssues -->[% END %]
<!--/if previssues -->[% END %]
      </tbody>
    </table>
    [% IF ( issuecount ) %]
    <fieldset class="action">
        [% IF ( CAN_user_circulate_override_renewals ) %]
        [% IF ( AllowRenewalLimitOverride ) %]
        <label for="override_limit">Override renewal limit:</label>
        <input type="checkbox" name="override_limit" id="override_limit" value="1" />
        [% END %]
        [% END %]
        <input type="submit" name="renew_checked" value="Renew or Return checked items" />
        <input type="submit" id="renew_all" name="renew_all" value="Renew all" />
    </fieldset>
        [% IF ( exports_enabled ) %]
            <fieldset>
                <label for="export_formats"><b>Export checkouts using format:</b></label>
                <select name="export_formats" id="export_formats">
                    <option value="iso2709_995">ISO2709 with items</option>
                    <option value="iso2709">ISO2709 without items</option>
                    [% IF ( export_with_csv_profile ) %]
                        <option value="csv">CSV</option>
                    [% END %]
                </select>

               <label for="export_remove_fields">Don't export fields:</label> <input type="text" id="export_remove_fields" name="export_remove_fields" value="[% export_remove_fields %]" title="Use for iso2709 exports" />
                <input type="hidden" name="op" value="export" />
                <input type="hidden" id="export_format" name="format" value="iso2709" />
                <input type="hidden" id="dont_export_item" name="dont_export_item" value="0" />
                <input type="hidden" id="record_type" name="record_type" value="bibs" />
                <input type="button" id="export_submit" value="Export" />
            <input type="button" id="export_submit" value="Export" />
            </fieldset>
        [% END %]
    [% END %]
    </form>
[% ELSE %]
    <p>Patron has nothing checked out.</p>
[% END %]

</div>
- 

Return to bug 11703

Lines 190-193 __PACKAGE__->belongs_to( Link Here

(-)a/Koha/Schema/Result/Issue.pm (+24 lines)
190	{ join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },	190	{ join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
191	);	191	);
192		192
		193	__PACKAGE__->belongs_to(
		194	"item",
		195	"Koha::Schema::Result::Item",
		196	{ itemnumber => "itemnumber" },
		197	{
		198	is_deferrable => 1,
		199	join_type => "LEFT",
		200	on_delete => "CASCADE",
		201	on_update => "CASCADE",
		202	},
		203	);
		204
		205	__PACKAGE__->belongs_to(
		206	"branch",
		207	"Koha::Schema::Result::Branch",
		208	{ branchcode => "branchcode" },
		209	{
		210	is_deferrable => 1,
		211	join_type => "LEFT",
		212	on_delete => "CASCADE",
		213	on_update => "CASCADE",
		214	},
		215	);
		216
193	1;	217	1;

Lines 96-109 my ( $template, $loggedinuser, $cookie ) = get_template_and_user ( Link Here

(-)a/circ/circulation.pl (-94 lines)
96		96
97	my $branches = GetBranches();	97	my $branches = GetBranches();
98		98
99	my @failedrenews = $query->param('failedrenew'); # expected to be itemnumbers
100	our %renew_failed = ();
101	for (@failedrenews) { $renew_failed{$_} = 1; }
102
103	my @failedreturns = $query->param('failedreturn');
104	our %return_failed = ();
105	for (@failedreturns) { $return_failed{$_} = 1; }
106
107	my $findborrower = $query->param('findborrower') \|\| q{};	99	my $findborrower = $query->param('findborrower') \|\| q{};
108	$findborrower =~ s\|,\| \|g;	100	$findborrower =~ s\|,\| \|g;
109	my $borrowernumber = $query->param('borrowernumber');	101	my $borrowernumber = $query->param('borrowernumber');
Lines 466-556 our @relissues = (); Link Here
466	our @relprevissues = ();	458	our @relprevissues = ();
467	my $displayrelissues;	459	my $displayrelissues;
468		460
469	our $totalprice = 0;
470
471	sub build_issue_data {
472	my $issueslist = shift;
473	my $relatives = shift;
474
475	# split in 2 arrays for today & previous
476	foreach my $it ( @$issueslist ) {
477	my $itemtypeinfo = getitemtypeinfo( (C4::Context->preference('item-level_itypes')) ? $it->{'itype'} : $it->{'itemtype'} );
478
479	# set itemtype per item-level_itype syspref - FIXME this is an ugly hack
480	$it->{'itemtype'} = ( C4::Context->preference( 'item-level_itypes' ) ) ? $it->{'itype'} : $it->{'itemtype'};
481
482	($it->{'charge'}, $it->{'itemtype_charge'}) = GetIssuingCharges(
483	$it->{'itemnumber'}, $it->{'borrowernumber'}
484	);
485	$it->{'charge'} = sprintf("%.2f", $it->{'charge'});
486	my ($can_renew, $can_renew_error) = CanBookBeRenewed(
487	$it->{'borrowernumber'},$it->{'itemnumber'}
488	);
489	$it->{"renew_error_${can_renew_error}"} = 1 if defined $can_renew_error;
490	my $restype = C4::Reserves::GetReserveStatus( $it->{'itemnumber'} );
491	$it->{'can_renew'} = $can_renew;
492	$it->{'can_confirm'} = !$can_renew && !$restype;
493	$it->{'renew_error'} = ( $restype eq "Waiting" or $restype eq "Reserved" ) ? 1 : 0;
494	$it->{'checkoutdate'} = C4::Dates->new($it->{'issuedate'},'iso')->output('syspref');
495	$it->{'issuingbranchname'} = GetBranchName($it->{'branchcode'});
496
497	$totalprice += $it->{'replacementprice'} \|\| 0;
498	$it->{'itemtype'} = $itemtypeinfo->{'description'};
499	$it->{'itemtype_image'} = $itemtypeinfo->{'imageurl'};
500	$it->{'dd_sort'} = $it->{'date_due'};
501	$it->{'dd'} = output_pref($it->{'date_due'});
502	$it->{'displaydate_sort'} = $it->{'issuedate'};
503	$it->{'displaydate'} = output_pref($it->{'issuedate'});
504	#$it->{'od'} = ( $it->{'date_due'} lt $todaysdate ) ? 1 : 0 ;
505	$it->{'od'} = $it->{'overdue'};
506	$it->{'subtitle'} = GetRecordValue('subtitle', GetMarcBiblio($it->{biblionumber}), GetFrameworkCode($it->{biblionumber}));
507	$it->{'renew_failed'} = $renew_failed{$it->{'itemnumber'}};
508	$it->{'return_failed'} = $return_failed{$it->{'barcode'}};
509
510	if ( ( $it->{'issuedate'} && $it->{'issuedate'} gt $todaysdate )
511	\|\| ( $it->{'lastreneweddate'} && $it->{'lastreneweddate'} gt $todaysdate ) ) {
512	(!$relatives) ? push @todaysissues, $it : push @relissues, $it;
513	} else {
514	(!$relatives) ? push @previousissues, $it : push @relprevissues, $it;
515	}
516	($it->{'renewcount'},$it->{'renewsallowed'},$it->{'renewsleft'}) = C4::Circulation::GetRenewCount($it->{'borrowernumber'},$it->{'itemnumber'}); #Add renewal count to item data display
517	}
518	}
519
520	if ($borrower) {
521
522	# Getting borrower relatives
523	my @relborrowernumbers = GetMemberRelatives($borrower->{'borrowernumber'});
524	#push @borrowernumbers, $borrower->{'borrowernumber'};
525
526	# get each issue of the borrower & separate them in todayissues & previous issues
527	my $issueslist = GetPendingIssues($borrower->{'borrowernumber'});
528	my $relissueslist = [];
529	if ( @relborrowernumbers ) {
530	$relissueslist = GetPendingIssues(@relborrowernumbers);
531	}
532
533	build_issue_data($issueslist, 0);
534	build_issue_data($relissueslist, 1);
535
536	$displayrelissues = scalar($relissueslist);
537
538	if ( C4::Context->preference( "todaysIssuesDefaultSortOrder" ) eq 'asc' ) {
539	@todaysissues = sort { $a->{'timestamp'} cmp $b->{'timestamp'} } @todaysissues;
540	}
541	else {
542	@todaysissues = sort { $b->{'timestamp'} cmp $a->{'timestamp'} } @todaysissues;
543	}
544
545	if ( C4::Context->preference( "previousIssuesDefaultSortOrder" ) eq 'asc' ){
546	@previousissues = sort { $a->{'date_due'} cmp $b->{'date_due'} } @previousissues;
547	}
548	else {
549	@previousissues = sort { $b->{'date_due'} cmp $a->{'date_due'} } @previousissues;
550	}
551	}
552
553
554	my @values;	461	my @values;
555	my %labels;	462	my %labels;
556	my $CGIselectborrower;	463	my $CGIselectborrower;
Lines 739-745 $template->param( Link Here
739	duedatespec => $duedatespec,	646	duedatespec => $duedatespec,
740	message => $message,	647	message => $message,
741	CGIselectborrower => $CGIselectborrower,	648	CGIselectborrower => $CGIselectborrower,
742	totalprice => sprintf('%.2f', $totalprice),
743	totaldue => sprintf('%.2f', $total),	649	totaldue => sprintf('%.2f', $total),
744	todayissues => \@todaysissues,	650	todayissues => \@todaysissues,
745	previssues => \@previousissues,	651	previssues => \@previousissues,

Line 0 Link Here

(-)a/api/checkin.pl (+75 lines)
		1	#!/usr/bin/perl
		2
		3	# Copyright 2014 ByWater Solutions
		4	#
		5	# This file is part of Koha.
		6	#
		7	# Koha is free software; you can redistribute it and/or modify it under the
		8	# terms of the GNU General Public License as published by the Free Software
		9	# Foundation; either version 2 of the License, or (at your option) any later
		10	# version.
		11	#
		12	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
		13	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
		14	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
		15	#
		16	# You should have received a copy of the GNU General Public License along
		17	# with Koha; if not, write to the Free Software Foundation, Inc.,
		18	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
		19
		20	use Modern::Perl;
		21
		22	use CGI;
		23	use JSON qw(to_json);
		24
		25	use C4::Circulation;
		26	use C4::Items qw(GetBarcodeFromItemnumber);
		27	use C4::Context;
		28	use C4::Auth qw(check_cookie_auth);
		29
		30	use Koha::DateUtils qw(output_pref_due);
		31
		32	my $input = new CGI;
		33
		34	my ( $auth_status, $sessionID ) =
		35	check_cookie_auth( $input->cookie('CGISESSID'),
		36	{ circulate => 'circulate_remaining_permissions' } );
		37
		38	if ( $auth_status ne "ok" ) {
		39	exit 0;
		40	}
		41
		42	binmode STDOUT, ":encoding(UTF-8)";
		43	print $input->header( -type => 'text/plain', -charset => 'UTF-8' );
		44
		45	my $itemnumber = $input->param('itemnumber');
		46	my $borrowernumber = $input->param('borrowernumber');
		47	my $override_limit = $input->param('override_limit');
		48	my $exempt_fine = $input->param('exempt_fine');
		49	my $branchcode = $input->param('branchcode')
		50	\|\| C4::Context->userenv->{'branch'};
		51
		52	my $barcode = GetBarcodeFromItemnumber($itemnumber);
		53
		54	my $data;
		55	$data->{itemnumber} = $itemnumber;
		56	$data->{borrowernumber} = $borrowernumber;
		57	$data->{branchcode} = $branchcode;
		58
		59	if ( C4::Context->preference("InProcessingToShelvingCart") ) {
		60	my $item = GetItem($itemnumber);
		61	if ( $item->{'location'} eq 'PROC' ) {
		62	$item->{'location'} = 'CART';
		63	ModItem( $item, $item->{'biblionumber'}, $item->{'itemnumber'} );
		64	}
65	}
66
67	if ( C4::Context->preference("ReturnToShelvingCart") ) {
68	my $item = GetItem($itemnumber);
69	$item->{'location'} = 'CART';
70	ModItem( $item, $item->{'biblionumber'}, $item->{'itemnumber'} );
71	}
72
73	( $data->{returned} ) = AddReturn( $barcode, $branchcode, $exempt_fine );
74
75	print to_json($data);

Line 0 Link Here

(-)a/api/checkouts.pl (+116 lines)
		1	#!/usr/bin/perl
		2
		3	# This software is placed under the gnu General Public License, v2 (http://www.gnu.org/licenses/gpl.html)
		4
		5	# Copyright 2014 ByWater Solutions
		6	#
		7	# This file is part of Koha.
		8	#
		9	# Koha is free software; you can redistribute it and/or modify it under the
		10	# terms of the GNU General Public License as published by the Free Software
		11	# Foundation; either version 3 of the License, or (at your option) any later
		12	# version.
		13	#
		14	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
		15	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
		16	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
		17	#
		18	# You should have received a copy of the GNU General Public License along
		19	# with Koha; if not, write to the Free Software Foundation, Inc.,
		20	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
		21
		22	use Modern::Perl;
		23
		24	use CGI;
		25	use JSON qw(to_json);
		26
		27	use C4::Context;
		28	use C4::Charset;
		29	use C4::Auth qw(check_cookie_auth);
		30	use C4::Circulation qw(GetIssuingCharges CanBookBeRenewed GetRenewCount);
		31
		32	use Koha::Database;
		33	use Koha::DateUtils;
		34
		35	my $input = new CGI;
		36
		37	my ( $auth_status, $sessionID ) =
		38	check_cookie_auth( $input->cookie('CGISESSID'),
		39	{ circulate => 'circulate_remaining_permissions' } );
		40
		41	if ( $auth_status ne "ok" ) {
		42	exit 0;
		43	}
		44
		45	my $schema = Koha::Database->new()->schema();
		46
		47	my @sort_columns = qw/date_due title itype issuedate branchcode itemcallnumber/;
		48
		49	my $borrowernumber = $input->param('borrowernumber');
		50	my $offset = $input->param('iDisplayStart');
		51	my $results_per_page = $input->param('iDisplayLength');
		52	my $sorting_column = $sort_columns[ $input->param('iSortCol_0') ];
		53	my $sorting_direction = $input->param('sSortDir_0');
		54
		55	$results_per_page = undef if ( $results_per_page == -1 );
		56
		57	binmode STDOUT, ":encoding(UTF-8)";
		58	print $input->header( -type => 'text/plain', -charset => 'UTF-8' );
		59
		60	my $checkouts_rs =
		61	$schema->resultset('Issue')->search( { borrowernumber => $borrowernumber },
		62	{ prefetch => { 'item' => 'biblio' }, orderby => 'issuedate' } );
		63
		64	my @checkouts;
65	while ( my $c = $checkouts_rs->next() ) {
66	my $itemnumber = $c->itemnumber()->itemnumber();
67
68	my ($charge) = GetIssuingCharges(
69	$c->itemnumber()->itemnumber(),
70	$c->borrowernumber()->borrowernumber()
71	);
72
73	my ( $can_renew, $can_renew_error ) =
74	CanBookBeRenewed( $borrowernumber, $itemnumber );
75
76	my ( $renewals_count, $renewals_allowed, $renewals_remaining ) =
77	GetRenewCount( $borrowernumber, $itemnumber );
78
79	push(
80	@checkouts,
81	{
82	DT_RowId => "$itemnumber-$borrowernumber",
83	title => $c->item()->biblio()->title(),
84	author => $c->item()->biblio()->author(),
85	barcode => $c->item()->barcode(),
86	itemtype => $c->item()->effective_itemtype(),
87	branchcode => $c->branchcode(),
88	branchname => $c->branch->branchname(),
89	itemcallnumber => $c->item()->itemcallnumber() \|\| q{},
90	charge => $charge,
91	price => $c->item->replacementprice() \|\| q{},
92	can_renew => $can_renew,
93	can_renew_error => $can_renew_error,
94	itemnumber => $itemnumber,
95	borrowernumber => $borrowernumber,
96	biblionumber => $c->item()->biblio()->biblionumber,
97	issuedate => $c->issuedate(),
98	date_due => $c->date_due(),
99	renewals_count => $renewals_count,
100	renewals_allowed => $renewals_allowed,
101	renewals_remaining => $renewals_remaining,
102	issuedate_formatted =>
103	output_pref( dt_from_string( $c->issuedate() ) ),
104	date_due_formatted =>
105	output_pref_due( dt_from_string( $c->date_due() ) ),
106	}
107	);
108	}
109
110	my $data;
111	$data->{'iTotalRecords'} = scalar @checkouts; #FIXME
112	$data->{'iTotalDisplayRecords'} = scalar @checkouts;
113	$data->{'sEcho'} = $input->param('sEcho') \|\| undef;
114	$data->{'aaData'} = \@checkouts;
115
116	print to_json($data);

Line 0 Link Here

(-)a/api/renew.pl (+63 lines)
	1	#!/usr/bin/perl
	2
	3	# Copyright 2014 ByWater Solutions
	4	#
	5	# This file is part of Koha.
	6	#
	7	# Koha is free software; you can redistribute it and/or modify it under the
	8	# terms of the GNU General Public License as published by the Free Software
	9	# Foundation; either version 2 of the License, or (at your option) any later
	10	# version.
	11	#
	12	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
	13	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
	14	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
	15	#
	16	# You should have received a copy of the GNU General Public License along
	17	# with Koha; if not, write to the Free Software Foundation, Inc.,
	18	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
	19
	20	use Modern::Perl;
	21
	22	use CGI;
	23	use JSON qw(to_json);
	24
	25	use C4::Circulation;
	26	use C4::Context;
	27	use C4::Auth qw(check_cookie_auth);
	28
	29	use Koha::DateUtils qw(output_pref_due);
	30
	31	my $input = new CGI;
	32
	33	my ( $auth_status, $sessionID ) =
	34	check_cookie_auth( $input->cookie('CGISESSID'),
	35	{ circulate => 'circulate_remaining_permissions' } );
	36
	37	if ( $auth_status ne "ok" ) {
	38	exit 0;
	39	}
	40
	41	binmode STDOUT, ":encoding(UTF-8)";
	42	print $input->header( -type => 'text/plain', -charset => 'UTF-8' );
	43
	44	my $itemnumber = $input->param('itemnumber');
	45	my $borrowernumber = $input->param('borrowernumber');
	46	my $override_limit = $input->param('override_limit');
	47	my $branchcode = $input->param('branchcode')
	48	\|\| C4::Context->userenv->{'branch'};
	49
	50	my $data;
	51	$data->{itemnumber} = $itemnumber;
	52	$data->{borrowernumber} = $borrowernumber;
	53	$data->{branchcode} = $branchcode;
	54
	55	( $data->{renew_okay}, $data->{error} ) =
	56	CanBookBeRenewed( $borrowernumber, $itemnumber, $override_limit );
	57
	58	if ( $data->{renew_okay} ) {
	59	my $date_due = AddRenewal( $borrowernumber, $itemnumber, $branchcode );
	60	$data->{date_due} = output_pref_due( $date_due );
	61	}
	62
	63	print to_json($data);

Lines 1-57 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/js/pages/circulation.js (-35 / +106 lines)
1	$(document).ready(function() {	1	$(document).ready(function() {
2	$('#patronlists').tabs();	2	// Handle the select all/none links for checkouts table columns
3	var allcheckboxes = $(".checkboxed");	3	$("#CheckAllRenewals").on("click",function(){
4	$("#renew_all").on("click",function(){	4	$("#UncheckAllCheckins").click();
5	allcheckboxes.checkCheckboxes(":input[name*=items]");	5	$(".renew:visible").attr("checked", "checked" );
6	allcheckboxes.unCheckCheckboxes(":input[name*=barcodes]");	6	return false;
7	});
8	$("#CheckAllitems").on("click",function(){
9	allcheckboxes.checkCheckboxes(":input[name*=items]");
10	allcheckboxes.unCheckCheckboxes(":input[name*=barcodes]"); return false;
11	});	7	});
12	$("#CheckNoitems").on("click",function(){	8	$("#UncheckAllRenewals").on("click",function(){
13	allcheckboxes.unCheckCheckboxes(":input[name*=items]"); return false;	9	$(".renew:visible").removeAttr("checked");
		10	return false;
14	});	11	});
15	$("#CheckAllreturns").on("click",function(){	12
16	allcheckboxes.checkCheckboxes(":input[name*=barcodes]");	13	$("#CheckAllCheckins").on("click",function(){
17	allcheckboxes.unCheckCheckboxes(":input[name*=items]"); return false;	14	$("#UncheckAllRenewals").click();
		15	$(".checkin:visible").attr("checked", "checked" );
		16	return false;
18	});	17	});
19	$("#CheckNoreturns" ).on("click",function(){	18	$("#UncheckAllCheckins").on("click",function(){
20	allcheckboxes.unCheckCheckboxes(":input[name*=barcodes]"); return false;	19	$(".checkin:visible").removeAttr("checked");
		20	return false;
21	});	21	});
22		22
23	$("#CheckAllexports").on("click",function(){	23	$("#CheckAllExports").on("click",function(){
24	allcheckboxes.checkCheckboxes(":input[name*=biblionumbers]");	24	$(".export:visible").attr("checked", "checked" );
25	return false;	25	return false;
26	});	26	});
27	$("#CheckNoexports").on("click",function(){	27	$("#UncheckAllExports").on("click",function(){
28	allcheckboxes.unCheckCheckboxes(":input[name*=biblionumbers]");	28	$(".export:visible").removeAttr("checked");
29	return false;	29	return false;
30	});	30	});
31		31
32	$("#relrenew_all").on("click",function(){	32	// Don't allow both return and renew checkboxes to be checked
33	allcheckboxes.checkCheckboxes(":input[name*=items]");	33	$(document).on("change", '.renew', function(){
34	allcheckboxes.unCheckCheckboxes(":input[name*=barcodes]");	34	if ( $(this).is(":checked") ) {
35	});	35	$( "#checkin_" + $(this).val() ).removeAttr("checked");
36	$("#relCheckAllitems").on("click",function(){	36	}
37	allcheckboxes.checkCheckboxes(":input[name*=items]");
38	allcheckboxes.unCheckCheckboxes(":input[name*=barcodes]"); return false;
39	});	37	});
40	$("#relCheckNoitems").on("click",function(){	38	$(document).on("change", '.checkin', function(){
41	allcheckboxes.unCheckCheckboxes(":input[name*=items]"); return false;	39	if ( $(this).is(":checked") ) {
		40	$( "#renew_" + $(this).val() ).removeAttr("checked");
		41	}
42	});	42	});
43	$("#relCheckAllreturns").on("click",function(){	43
44	allcheckboxes.checkCheckboxes(":input[name*=barcodes]");	44	// Handle renewals
45	allcheckboxes.unCheckCheckboxes(":input[name*=items]"); return false;	45	$("#RenewCheckinChecked").on("click",function(){
		46	$(".checkin:checked:visible").each(function() {
		47	itemnumber = $(this).val();
		48
		49	$(this).replaceWith("<img id='checkin_" + itemnumber + "' src='" + interface + "/" + theme + "/img/loading-small.gif' />");
		50
		51	params = {
		52	itemnumber: itemnumber,
		53	borrowernumber: borrowernumber,
		54	branchcode: branchcode
		55	};
		56
		57	$.post( "/cgi-bin/koha/api/checkin.pl", params, function( data ) {
		58	id = "#checkin_" + data.itemnumber;
		59
		60	content = "";
		61	if ( data.returned ) {
		62	content = _("Returned");
		63	} else {
		64	content = _("Unable to return");
		65	}
		66
		67	$(id).replaceWith( content );
		68	}, "json")
		69	});
		70
		71	$(".renew:checked:visible").each(function() {
		72	var override_limit = $("#override_limit").is(':checked') ? 1 : 0;
		73
		74	var itemnumber = $(this).val();
		75
		76	$(this).replaceWith("<img id='renew_" + itemnumber + "' src='" + interface + "/" + theme + "/img/loading-small.gif' />");
		77
		78	var params = {
		79	itemnumber: itemnumber,
		80	borrowernumber: borrowernumber,
		81	branchcode: branchcode,
		82	override_limit: override_limit
		83	};
		84
		85	$.post( "/cgi-bin/koha/api/renew.pl", params, function( data ) {
		86	var id = "#renew_" + data.itemnumber;
		87
		88	var content = "";
		89	if ( data.renew_okay ) {
		90	content = _("Renewed, due: ") + data.date_due;
		91	} else {
		92	content = _("Renew failed: ");
		93	if ( data.error == "no_checkout" ) {
		94	content += _("not checked out");
		95	} else if ( data.error == "too_many" ) {
		96	content += _("too many renewals");
		97	} else if ( data.error == "on_reserve" ) {
		98	content += _("on reserve");
		99	} else if ( data.error ) {
		100	content += data.error;
		101	} else {
		102	content += _("reason unknown");
		103	}
		104	}
		105
		106	$(id).replaceWith( content );
		107	}, "json")
		108	});
46	});	109	});
47	$("#relCheckNoreturns").on("click",function(){	110
48	allcheckboxes.unCheckCheckboxes(":input[name*=barcodes]"); return false;	111	$("#RenewAll").on("click",function(){
		112	$("#CheckAllRenewals").click();
		113	$("#UncheckAllCheckins").click();
		114	$("#RenewCheckinChecked").click();
49	});	115	});
		116
		117	$('#patronlists').tabs();
		118
50	$("#messages ul").after("<a href=\"#\" id=\"addmessage\">"+MSG_ADD_MESSAGE+"</a>");	119	$("#messages ul").after("<a href=\"#\" id=\"addmessage\">"+MSG_ADD_MESSAGE+"</a>");
		120
51	$("#borrower_messages .cancel").on("click",function(){	121	$("#borrower_messages .cancel").on("click",function(){
52	$("#add_message_form").hide();	122	$("#add_message_form").hide();
53	$("#addmessage").show();	123	$("#addmessage").show();
54	});	124	});
		125
55	$("#addmessage").on("click",function(){	126	$("#addmessage").on("click",function(){
56	$(this).hide();	127	$(this).hide();
57	$("#add_message_form").show();	128	$("#add_message_form").show();
Lines 77-83 $(document).ready(function() { Link Here
77	return false;	148	return false;
78	});	149	});
79	// Clicking the table cell checks the checkbox inside it	150	// Clicking the table cell checks the checkbox inside it
80	$("td").on("click",function(e){	151	$(document).on("click", 'td', function(e){
81	if(e.target.tagName.toLowerCase() == 'td'){	152	if(e.target.tagName.toLowerCase() == 'td'){
82	$(this).find("input:checkbox:visible").each( function() {	153	$(this).find("input:checkbox:visible").each( function() {
83	$(this).click();	154	$(this).click();