X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=members%2Frouting-lists.pl;h=c3e6c8d965626ac91c111831c50070a958b0b959;hb=d3e459289f9e9b2ee4a138693d855e829a9b0a82;hp=70165f7553dd2db588ad85e90abe59cb2c37f2c4;hpb=09b8ce2a5f6ef81a2bc3c347a92d01ba7bc5845d;p=koha.git

diff --git a/members/routing-lists.pl b/members/routing-lists.pl
index 70165f7553..c3e6c8d965 100755
--- a/members/routing-lists.pl
+++ b/members/routing-lists.pl
@@ -4,45 +4,33 @@
 #
 # 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; FIXME - Bug 2505
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Output;
-use C4::Auth qw/:DEFAULT get_session/;
-use C4::Branch; # GetBranches
+use C4::Auth qw/:DEFAULT/;
 use C4::Members;
+use C4::Members::Attributes qw(GetBorrowerAttributes);
 use C4::Context;
 use C4::Serials;
+use Koha::Patron::Images;
 use CGI::Session;
 
 my $query = new CGI;
 
-my $sessionID = $query->cookie("CGISESSID") ;
-my $session = get_session($sessionID);
-
-# branch are now defined by the userenv
-# but first we have to check if someone has tried to change them
-
-my $branch = $query->param('branch');
-if ($branch){
-    # update our session so the userenv is updated
-    $session->param('branch', $branch);
-    $session->param('branchname', GetBranchName($branch));
-}
-
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user (
     {
         template_name   => 'members/routing-lists.tt',
@@ -53,19 +41,17 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user (
     }
 );
 
-my $branches = GetBranches();
-
 my $findborrower = $query->param('findborrower');
 $findborrower =~ s|,| |g;
 
 my $borrowernumber = $query->param('borrowernumber');
 
-$branch  = C4::Context->userenv->{'branch'};
+my $branch = C4::Context->userenv->{'branch'};
 
 # get the borrower information.....
 my $borrower;
 if ($borrowernumber) {
-    $borrower = GetMemberDetails( $borrowernumber, 0 );
+    $borrower = GetMember( borrowernumber => $borrowernumber );
 }
 
 
@@ -94,41 +80,31 @@ if ($borrowernumber) {
         routinglistview => 1
     );
 
-    $template->param( adultborrower => 1 ) if ( $borrower->{'category_type'} eq 'A' );
+    $template->param( adultborrower => 1 ) if ( $borrower->{'category_type'} eq 'A' || $borrower->{'category_type'} eq 'I' );
 }
 
 ##################################################################################
 
-
-# Computes full borrower address
-my (undef, $roadttype_hashref) = &GetRoadTypes();
-my $address = $borrower->{'streetnumber'}.' '.$roadttype_hashref->{$borrower->{'streettype'}}.' '.$borrower->{'address'};
+$template->param(%$borrower);
 
 $template->param(
-
     findborrower      => $findborrower,
     borrower          => $borrower,
     borrowernumber    => $borrowernumber,
     branch            => $branch,
-    branchname        => GetBranchName($borrower->{'branchcode'}),
-    firstname         => $borrower->{'firstname'},
-    surname           => $borrower->{'surname'},
-    categorycode      => $borrower->{'categorycode'},
     categoryname      => $borrower->{description},
-    address           => $address,
-    address2          => $borrower->{'address2'},
-    email             => $borrower->{'email'},
-    emailpro          => $borrower->{'emailpro'},
-    borrowernotes     => $borrower->{'borrowernotes'},
-    city              => $borrower->{'city'},
-    zipcode           => $borrower->{'zipcode'},
-    country           => $borrower->{'country'},
-    phone             => $borrower->{'phone'} || $borrower->{'mobile'},
-    cardnumber        => $borrower->{'cardnumber'},
-    RoutingSerials => C4::Context->preference('RoutingSerials'),
+    RoutingSerials    => C4::Context->preference('RoutingSerials'),
 );
 
-my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'});
-$template->param( picture => 1 ) if $picture;
+if (C4::Context->preference('ExtendedPatronAttributes')) {
+    my $attributes = GetBorrowerAttributes($borrowernumber);
+    $template->param(
+        ExtendedPatronAttributes => 1,
+        extendedattributes => $attributes
+    );
+}
+
+my $patron_image = Koha::Patron::Images->find($borrower->{borrowernumber});
+$template->param( picture => 1 ) if $patron_image;
 
 output_html_with_http_headers $query, $cookie, $template->output;