Bug 19074: Fix category display in Batch patron modification.

[koha.git] / tools / viewlog.pl

diff --git a/tools/viewlog.pl b/tools/viewlog.pl
index 4d5d42f..9af64d5 100755 (executable)
--- a/tools/viewlog.pl
+++ b/tools/viewlog.pl
@@ -25,13 +25,12 @@ use CGI qw ( -utf8 );
 use Text::CSV::Encoded;
 use C4::Context;
 use C4::Koha;
-use C4::Dates;
 use C4::Output;
 use C4::Log;
 use C4::Items;
-use C4::Branch;
 use C4::Debug;
 use C4::Search;    # enabled_staff_search_views
+use Koha::Patrons;
 
 use vars qw($debug $cgi_debug);
 
@@ -45,9 +44,10 @@ my $input = new CGI;
 
 $debug or $debug = $cgi_debug;
 my $do_it    = $input->param('do_it');
-my @modules  = $input->param("modules");
+my @modules  = $input->multi_param("modules");
 my $user     = $input->param("user") // '';
-my @actions  = $input->param("actions");
+my @actions  = $input->multi_param("actions");
+my @interfaces  = $input->multi_param("interfaces");
 my $object   = $input->param("object");
 my $info     = $input->param("info");
 my $datefrom = $input->param("from");
@@ -73,9 +73,9 @@ if ( $src eq 'circ' ) {
     use C4::Members;
     use C4::Members::Attributes qw(GetBorrowerAttributes);
     my $borrowernumber = $object;
-    my $data = GetMember( 'borrowernumber' => $borrowernumber );
-    my ( $picture, $dberror ) = GetPatronImage( $data->{'borrowernumber'} );
-    $template->param( picture => 1 ) if $picture;
+    my $patron = Koha::Patrons->find( $borrowernumber );
+    $template->param( picture => 1 ) if $patron->image;
+    my $data = $patron->unblessed;
 
     if ( C4::Context->preference('ExtendedPatronAttributes') ) {
         my $attributes = GetBorrowerAttributes( $data->{'borrowernumber'} );
@@ -85,35 +85,12 @@ if ( $src eq 'circ' ) {
         );
     }
 
-    # Computes full borrower address
-    my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} );
-    my $address = $data->{'streetnumber'} . " $roadtype " . $data->{'address'};
+    $template->param(%$data);
 
     $template->param(
         menu           => 1,
-        title          => $data->{'title'},
-        initials       => $data->{'initials'},
-        surname        => $data->{'surname'},
-        othernames     => $data->{'othernames'},
         borrowernumber => $borrowernumber,
-        firstname      => $data->{'firstname'},
-        cardnumber     => $data->{'cardnumber'},
-        categorycode   => $data->{'categorycode'},
-        category_type  => $data->{'category_type'},
-        categoryname   => $data->{'description'},
-        address        => $address,
-        address2       => $data->{'address2'},
-        city           => $data->{'city'},
-        state          => $data->{'state'},
-        zipcode        => $data->{'zipcode'},
-        country        => $data->{'country'},
-        phone          => $data->{'phone'},
-        phonepro       => $data->{'phonepro'},
-        mobile         => $data->{'mobile'},
-        email          => $data->{'email'},
-        emailpro       => $data->{'emailpro'},
-        branchcode     => $data->{'branchcode'},
-        branchname     => GetBranchName( $data->{'branchcode'} ),
+        categoryname   => $patron->category->description,
         RoutingSerials => C4::Context->preference('RoutingSerials'),
     );
 }
@@ -121,15 +98,17 @@ if ( $src eq 'circ' ) {
 $template->param(
     debug => $debug,
     C4::Search::enabled_staff_search_views,
+    object => $object,
 );
 
 if ($do_it) {
 
     my @data;
-    my ( $results, $modules, $actions );
+    my ( $results, $modules, $actions, $interfaces );
     if ( defined $actions[0] && $actions[0] ne '' ) { $actions  = \@actions; }     # match All means no limit
     if ( $modules[0] ne '' ) { $modules = \@modules; }    # match All means no limit
-    $results = GetLogs( $datefrom, $dateto, $user, $modules, $actions, $object, $info );
+    if ( defined $interfaces[0] && $interfaces[0] ne '' ) { $interfaces = \@interfaces; }    # match All means no limit
+    $results = GetLogs( $datefrom, $dateto, $user, $modules, $actions, $object, $info, $interfaces );
     @data = @$results;
     foreach my $result (@data) {
 
@@ -157,20 +136,20 @@ if ($do_it) {
 
         #always add firstname and surname for librarian/user
         if ( $result->{'user'} ) {
-            my $userdetails = C4::Members::GetMemberDetails( $result->{'user'} );
-            if ($userdetails) {
-                $result->{'userfirstname'} = $userdetails->{'firstname'};
-                $result->{'usersurname'}   = $userdetails->{'surname'};
+            my $patron = Koha::Patrons->find( $result->{'user'} );
+            if ($patron) {
+                $result->{'userfirstname'} = $patron->firstname;
+                $result->{'usersurname'}   = $patron->surname;
             }
         }
 
         #add firstname and surname for borrower, when using the CIRCULATION, MEMBERS, FINES
         if ( $result->{module} eq "CIRCULATION" || $result->{module} eq "MEMBERS" || $result->{module} eq "FINES" ) {
             if ( $result->{'object'} ) {
-                my $borrowerdetails = C4::Members::GetMemberDetails( $result->{'object'} );
-                if ($borrowerdetails) {
-                    $result->{'borrowerfirstname'} = $borrowerdetails->{'firstname'};
-                    $result->{'borrowersurname'}   = $borrowerdetails->{'surname'};
+                my $patron = Koha::Patrons->find( $result->{'object'} );
+                if ($patron) {
+                    $result->{'borrowerfirstname'} = $patron->firstname;
+                    $result->{'borrowersurname'}   = $patron->surname;
                 }
             }
         }
@@ -187,11 +166,11 @@ if ($do_it) {
             datefrom => $datefrom,
             dateto   => $dateto,
             user     => $user,
-            object   => $object,
             info     => $info,
             src      => $src,
             modules  => \@modules,
             actions  => \@actions,
+            interfaces => \@interfaces
         );
 
         # Used modules