From d6de78624e61d602de2ed60f48951af3e4947949 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Mon, 4 Jul 2016 13:38:45 +0100
Subject: [PATCH] Bug 16852: Remove GetBorrowerCategorycode

And use Koha::Patron->categorycode instead

Test plan:
- Restrict a patron attribute to a patron category
- Use the batch patron modification tool to update a patron of this
  category
You should not see the the patron attribute

Signed-off-by: Claire Gravely <claire_gravely@hotmail.com>

Signed-off-by: Katrin Fischer  <katrin.fischer@bsz-bw.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
 C4/Members.pm         | 24 +-----------------------
 tools/modborrowers.pl |  4 ++--
 2 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/C4/Members.pm b/C4/Members.pm
index 8d3c3cffe7..8953d85fe7 100644
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -78,8 +78,6 @@ BEGIN {
         &GetMemberAccountRecords
         &GetBorNotifyAcctRecord
 
-        GetBorrowerCategorycode
-
         &GetBorrowersToExpunge
         &GetBorrowersWhoHaveNeverBorrowed
         &GetBorrowersWithIssuesHistoryOlderThan
@@ -522,7 +520,7 @@ sub ModMember {
         }
     }
 
-    my $old_categorycode = GetBorrowerCategorycode( $data{borrowernumber} );
+    my $old_categorycode = Koha::Patrons->find( $data{borrowernumber} )->categorycode;
 
     # get only the columns of a borrower
     my $schema = Koha::Database->new()->schema;
@@ -1213,26 +1211,6 @@ sub GetUpcomingMembershipExpires {
     return $results;
 }
 
-=head2 GetBorrowerCategorycode
-
-    $categorycode = &GetBorrowerCategoryCode( $borrowernumber );
-
-Given the borrowernumber, the function returns the corresponding categorycode
-
-=cut
-
-sub GetBorrowerCategorycode {
-    my ( $borrowernumber ) = @_;
-    my $dbh = C4::Context->dbh;
-    my $sth = $dbh->prepare( qq{
-        SELECT categorycode
-        FROM borrowers
-        WHERE borrowernumber = ?
-    } );
-    $sth->execute( $borrowernumber );
-    return $sth->fetchrow;
-}
-
 =head2 GetAge
 
   $dateofbirth,$date = &GetAge($date);
diff --git a/tools/modborrowers.pl b/tools/modborrowers.pl
index 31e4ec1fa2..8f0a567324 100755
--- a/tools/modborrowers.pl
+++ b/tools/modborrowers.pl
@@ -38,6 +38,7 @@ use Koha::DateUtils qw( dt_from_string );
 use Koha::List::Patron;
 use Koha::Libraries;
 use Koha::Patron::Categories;
+use Koha::Patrons;
 
 my $input = new CGI;
 my $op = $input->param('op') || 'show_form';
@@ -294,8 +295,7 @@ if ( $op eq 'do' ) {
             }
         }
 
-        #
-        my $borrower_categorycode = GetBorrowerCategorycode $borrowernumber;
+        my $borrower_categorycode = Koha::Patrons->find( $borrowernumber )->categorycode;
         my $i=0;
         for ( @attributes ) {
             my $attribute;
-- 
2.39.5