Bug 32814: Fix cataloguing/value_builder/callnumber-KU.pl

[koha-ffzg.git] / members / memberentry.pl

diff --git a/members/memberentry.pl b/members/memberentry.pl
index 1b6aac6..0193cc3 100755 (executable)
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -35,7 +35,7 @@ use C4::Form::MessagingPreferences;
 use Koha::AuthUtils;
 use Koha::AuthorisedValues;
 use Koha::Email;
-use Koha::Patron::Debarments qw( AddDebarment DelDebarment GetDebarments );
+use Koha::Patron::Debarments qw( AddDebarment DelDebarment );
 use Koha::Patron::Restriction::Types;
 use Koha::Cities;
 use Koha::DateUtils qw( dt_from_string );
@@ -118,8 +118,7 @@ foreach my $id ( @delete_guarantor ) {
 
 ## Deal with debarments
 $template->param(
-    debarments => scalar GetDebarments( { borrowernumber => $borrowernumber } ),
-    restriction_types => scalar Koha::Patron::Restriction::Types->keyed_on_code()
+    restriction_types => scalar Koha::Patron::Restriction::Types->search()
 );
 my @debarments_to_remove = $input->multi_param('remove_debarment');
 foreach my $d ( @debarments_to_remove ) {
@@ -658,7 +657,13 @@ my $patron_categories = Koha::Patron::Categories->search_with_library_limits(
 );
 my $no_categories = ! $patron_categories->count;
 my $categories = {};
-foreach my $patron_category ($patron_categories->as_list ) {
+my @patron_categories = $patron_categories->as_list;
+# When adding a guarantor we don't have a category yet, and only want to choose from the eligible categories
+unless ( !$category || $patron_categories->find( $category->id ) ){
+    $template->param( limited_category => 1 );
+    push @patron_categories, $category;
+}
+foreach my $patron_category ( @patron_categories ) {
     push @{ $categories->{ $patron_category->category_type } }, $patron_category;
 }
 
@@ -688,29 +693,6 @@ while (@relationships) {
   push(@relshipdata, \%row);
 }
 
-my %flags = (
-    'gonenoaddress' => ['gonenoaddress'],
-    'lost'          => ['lost']
-);
-
-my @flagdata;
-foreach ( keys(%flags) ) {
-    my $key = $_;
-    my %row = (
-        'key'  => $key,
-        'name' => $flags{$key}[0]
-    );
-    if ( $data{$key} ) {
-        $row{'yes'} = ' checked';
-        $row{'no'}  = '';
-    }
-    else {
-        $row{'yes'} = '';
-        $row{'no'}  = ' checked';
-    }
-    push @flagdata, \%row;
-}
-
 # get Branch Loop
 # in modify mod: userbranch value comes from borrowers table
 # in add    mod: userbranch value comes from branches table (ip correspondence)
@@ -794,7 +776,6 @@ $template->param(
   borrowernumber  => $borrowernumber, #register number
   relshiploop => \@relshipdata,
   btitle=> $default_borrowertitle,
-  flagloop  => \@flagdata,
   modify          => $modify,
   nok     => $nok,#flag to know if an error
   NoUpdateLogin =>  $NoUpdateLogin,