Bug 4041: (QA followup) fix issues raised by koha-qa.pl

[srvgit] / members / maninvoice.pl

diff --git a/members/maninvoice.pl b/members/maninvoice.pl
index 240c680..164b833 100755 (executable)
--- a/members/maninvoice.pl
+++ b/members/maninvoice.pl
@@ -9,18 +9,18 @@
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use strict;
 use warnings;
@@ -109,43 +109,24 @@ if ($add){
     my ($picture, $dberror) = GetPatronImage($data->{'borrowernumber'});
     $template->param( picture => 1 ) if $picture;
 
-if (C4::Context->preference('ExtendedPatronAttributes')) {
-    my $attributes = GetBorrowerAttributes($borrowernumber);
-    $template->param(
-        ExtendedPatronAttributes => 1,
-        extendedattributes => $attributes
-    );
-}
-
-# Computes full borrower address
-my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} );
-my $address = $data->{'streetnumber'} . " $roadtype " . $data->{'address'};
+    if (C4::Context->preference('ExtendedPatronAttributes')) {
+        my $attributes = GetBorrowerAttributes($borrowernumber);
+        $template->param(
+            ExtendedPatronAttributes => 1,
+            extendedattributes => $attributes
+        );
+    }
 
-       $template->param(
-                finesview => 1,
-                borrowernumber => $borrowernumber,
-               firstname => $data->{'firstname'},
-                surname  => $data->{'surname'},
-        othernames => $data->{'othernames'},
-               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'}),
-               is_child        => ($data->{'category_type'} eq 'C'),
-               activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
+    my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} );
+    $template->param(%$data);
+    $template->param(
+        finesview      => 1,
+        borrowernumber => $borrowernumber,
+        categoryname   => $data->{'description'},
+        branchname     => GetBranchName($data->{'branchcode'}),
+        roadtype       => $roadtype,
+        is_child       => ($data->{'category_type'} eq 'C'),
+        activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
         RoutingSerials => C4::Context->preference('RoutingSerials'),
     );
     output_html_with_http_headers $input, $cookie, $template->output;