From d83cab905dd2bfdc0ec8fa7dded94101f0a23588 Mon Sep 17 00:00:00 2001 From: jeremy breuillard Date: Tue, 1 Feb 2022 11:20:07 +0100 Subject: [PATCH] Bug 29983: Display the pretend claim column in overdue.tt This patch displays the column "Return claims" from the page "moremember.pl" to the page "overdues.pl". Rebase on master. Test plan: 1) Use a patron with at least 1 item who should be checked out soon 2) Home > Patron > Patron details for [name] 3) Click on the 'Checkout' button down the page to show the full table and notice the "Return Claims" column 4) Now go to Home > Circulation > Overdues 5) Find the patron who has to check out and have a look at the table 6) Apply patch and repeat 4) and 5) -> the "Return Claim" column is now displayed on the table Signed-off-by: David Nind Signed-off-by: Jonathan Druart --- admin/columns_settings.yml | 3 + circ/overdue.pl | 12 +- .../prog/en/includes/checkouts-table.inc | 3 + .../prog/en/includes/modal-claims.inc | 104 ++++++++++++++++++ .../prog/en/modules/circ/circulation.tt | 2 + .../prog/en/modules/circ/overdue.tt | 21 ++++ .../prog/en/modules/members/moremember.tt | 1 + koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 52 +-------- 8 files changed, 149 insertions(+), 49 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/modal-claims.inc diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml index d8e4254c64b..560b3cf5a8c 100644 --- a/admin/columns_settings.yml +++ b/admin/columns_settings.yml @@ -1505,6 +1505,9 @@ modules: columnname: price - columnname: non-public_note + - + columnname: claims_returned + is_hidden: 1 print_summary: print-summary-checkouts: diff --git a/circ/overdue.pl b/circ/overdue.pl index 33f2d1b3cd5..9e96c4c0130 100755 --- a/circ/overdue.pl +++ b/circ/overdue.pl @@ -255,12 +255,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 or $datedueto); @@ -308,6 +311,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 @@ -347,6 +355,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, diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc index c3ae4e2a232..c74be444ac4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc +++ b/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' %]