Bug 17600: Standardize our EXPORT_OK

[srvgit] / members / readingrec.pl

diff --git a/members/readingrec.pl b/members/readingrec.pl
index 015c56c..b0e2a5b 100755 (executable)
--- a/members/readingrec.pl
+++ b/members/readingrec.pl
@@ -24,12 +24,11 @@ use Modern::Perl;
 
 use CGI qw ( -utf8 );
 
-use C4::Auth;
-use C4::Output;
-use C4::Members;
-use List::MoreUtils qw/any uniq/;
-use Koha::DateUtils;
-use C4::Members::Attributes qw(GetBorrowerAttributes);
+use C4::Auth qw( get_template_and_user );
+use C4::Output qw( output_and_exit_if_error output_and_exit output_html_with_http_headers );
+use C4::Members qw( GetAllIssues );
+use List::MoreUtils qw( uniq );
+use Koha::DateUtils qw( dt_from_string );
 
 use Koha::Patrons;
 use Koha::Patron::Categories;
@@ -39,9 +38,7 @@ my $input = CGI->new;
 my ($template, $loggedinuser, $cookie)= get_template_and_user({template_name => "members/readingrec.tt",
                                query => $input,
                                type => "intranet",
-                               authnotrequired => 0,
                 flagsrequired => {borrowers => 'edit_borrowers'},
-                               debug => 1,
                                });
 
 my $op = $input->param('op') || '';
@@ -55,30 +52,19 @@ if ($input->param('borrowernumber')) {
     $patron = Koha::Patrons->find( $borrowernumber );
 }
 
-my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
+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',
@@ -92,24 +78,22 @@ if ( $op eq 'export_barcodes' ) {
     }
 }
 
-if ( $patron->is_child ) {
-    my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
-    $template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1;
-    $template->param( 'catcode' => $patron_categories->next->categorycode )  if $patron_categories->count == 1;
+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';
 }
 
-if (C4::Context->preference('ExtendedPatronAttributes')) {
-    my $attributes = GetBorrowerAttributes($patron->borrowernumber);
-    $template->param(
-        ExtendedPatronAttributes => 1,
-        extendedattributes => $attributes
-    );
-}
-
 $template->param(
     patron            => $patron,
     readingrecordview => 1,