@@ -, +, @@ --- circ/overdue.pl | 12 ++++- .../prog/en/includes/checkouts-table.inc | 3 ++ .../prog/en/includes/js-date-format.inc | 2 +- .../prog/en/modules/circ/overdue.tt | 21 ++++++++ .../prog/en/modules/members/moremember.tt | 1 + koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 52 ++----------------- 6 files changed, 41 insertions(+), 50 deletions(-) --- a/circ/overdue.pl +++ a/circ/overdue.pl @@ -250,12 +250,15 @@ if ($noreport) { items.replacementprice, items.enumchron, items.itemnotes_nonpublic, - items.itype + items.itype, + return_claims.created_on AS return_claim_created_on, + return_claims.id AS return_claim_id FROM issues LEFT JOIN borrowers ON (issues.borrowernumber=borrowers.borrowernumber ) LEFT JOIN items ON (issues.itemnumber=items.itemnumber) LEFT JOIN biblioitems ON (biblioitems.biblioitemnumber=items.biblioitemnumber) LEFT JOIN biblio ON (biblio.biblionumber=items.biblionumber ) + LEFT JOIN return_claims ON (return_claims.borrowernumber=borrowers.borrowernumber AND return_claims.itemnumber=items.itemnumber) WHERE 1=1 "; # placeholder, since it is possible that none of the additional # conditions will be selected by user $strsth.=" AND date_due < '" . $todaysdate . "' " unless ($showall); @@ -303,6 +306,11 @@ if ($noreport) { my $pattrs = $borrowernumber_to_attributes{$data->{borrowernumber}} || {}; # patron attrs for this borrower # $pattrs is a hash { attrcode => [ [value,displayvalue], [value,displayvalue]... ] } + my $return_claim_created_on = $data->{return_claim_created_on}; + if ( defined $return_claim_created_on ) { + $return_claim_created_on = output_pref({ dt => dt_from_string($return_claim_created_on ) }); + } + my @patron_attr_value_loop; # template array [ {value=>v1}, {value=>v2} ... } ] for my $pattr_filter (grep { ! $_->{isclone} } @patron_attr_filter_loop) { my @displayvalues = map { $_->[1] } @{ $pattrs->{$pattr_filter->{code}} }; # grab second value from each subarray @@ -339,6 +347,8 @@ if ($noreport) { itemcallnumber => $data->{itemcallnumber}, replacementprice => $data->{replacementprice}, itemnotes_nonpublic => $data->{itemnotes_nonpublic}, + return_claim_created_on => $return_claim_created_on, + return_claim_id => $data->{return_claim_id}, enumchron => $data->{enumchron}, itemtype => $data->{itype}, patron_attr_value_loop => \@patron_attr_value_loop, --- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc @@ -1,4 +1,5 @@ [% USE Koha %] +[% PROCESS 'modal-claims.inc' %]
[% IF ( issuecount ) %]
@@ -92,6 +93,8 @@
+ +[% PROCESS 'modal-claims-display' %]