From 4f96b6767a1be022a4e38a856491b2b1eae782fc Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Fri, 5 Mar 2021 11:45:12 +0100
Subject: [PATCH] Bug 27851: Use filter_by_todays_checkins in
 members/readingrec.pl

Test plan:
Do some checkouts
Checkin with different return dates (several today however)
Check the circulation history and confirm that the checkout list is correct

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 members/readingrec.pl | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/members/readingrec.pl b/members/readingrec.pl
index d484e69bf8..c8fddf3379 100755
--- a/members/readingrec.pl
+++ b/members/readingrec.pl
@@ -56,27 +56,16 @@ if ($input->param('borrowernumber')) {
 my $logged_in_user = Koha::Patrons->find( $loggedinuser );
 output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
 
-my $order = 'date_due desc';
-my $limit = 0;
-my $issues = ();
-# Do not request the old issues of anonymous patron
-if ( $patron->borrowernumber eq C4::Context->preference('AnonymousPatron') ){
-    # use of 'eq' in the above comparison is intentional -- the
-    # system preference value could be blank
-    $template->param( is_anonymous => 1 );
-} else {
-    $issues = GetAllIssues($patron->borrowernumber,$order,$limit);
-}
-
 #   barcode export
 if ( $op eq 'export_barcodes' ) {
     # FIXME This should be moved out of this script
     if ( $patron->privacy < 2) {
-        my $today = output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 });
-        my @barcodes =
-          map { $_->{barcode} } grep { $_->{returndate} =~ m/^$today/o } @{$issues};
+        my @barcodes = $patron->old_checkouts->search( {}, { prefetch => 'item' } )
+          ->filter_by_todays_checkins->get_column('item.barcode');
+
         my $borrowercardnumber = $patron->cardnumber;
         my $delimiter = "\n";
+        my $today = dt_from_string->ymd;
         binmode( STDOUT, ":encoding(UTF-8)" );
         print $input->header(
             -type       => 'application/octet-stream',
@@ -90,6 +79,18 @@ if ( $op eq 'export_barcodes' ) {
     }
 }
 
+my $order = 'date_due desc';
+my $limit = 0;
+my $issues = ();
+# Do not request the old issues of anonymous patron
+if ( $patron->borrowernumber eq C4::Context->preference('AnonymousPatron') ){
+    # use of 'eq' in the above comparison is intentional -- the
+    # system preference value could be blank
+    $template->param( is_anonymous => 1 );
+} else {
+    $issues = GetAllIssues($patron->borrowernumber,$order,$limit);
+}
+
 if (! $limit){
 	$limit = 'full';
 }
-- 
2.39.5