Bug 11577 : Fixing a tiny typo

[srvgit] / members / memberentry.pl

diff --git a/members/memberentry.pl b/members/memberentry.pl
index 429768a..3c7f648 100755 (executable)
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -57,7 +57,7 @@ my %data;
 my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "members/memberentrygen.tmpl",
+    = get_template_and_user({template_name => "members/memberentrygen.tt",
            query => $input,
            type => "intranet",
            authnotrequired => 0,
@@ -293,9 +293,14 @@ if ($op eq 'save' || $op eq 'insert'){
     # If the cardnumber is blank, treat it as null.
     $newdata{'cardnumber'} = undef if $newdata{'cardnumber'} =~ /^\s*$/;
 
-    if (checkcardnumber($newdata{cardnumber},$newdata{borrowernumber})){ 
-        push @errors, 'ERROR_cardnumber';
-    } 
+    if (my $error_code = checkcardnumber($newdata{cardnumber},$newdata{borrowernumber})){
+        push @errors, $error_code == 1
+            ? 'ERROR_cardnumber_already_exists'
+            : $error_code == 2
+                ? 'ERROR_cardnumber_length'
+                : ()
+    }
+
     if ($newdata{dateofbirth} && $dateofbirthmandatory) {
         my $age = GetAge($newdata{dateofbirth});
         my $borrowercategory=GetBorrowercategory($newdata{'categorycode'});   
@@ -333,8 +338,13 @@ if ($op eq 'save' || $op eq 'insert'){
     $extended_patron_attributes = parse_extended_patron_attributes($input);
     foreach my $attr (@$extended_patron_attributes) {
         unless (C4::Members::Attributes::CheckUniqueness($attr->{code}, $attr->{value}, $borrowernumber)) {
+            my $attr_info = C4::Members::AttributeTypes->fetch($attr->{code});
             push @errors, "ERROR_extended_unique_id_failed";
-            $template->param(ERROR_extended_unique_id_failed_value => "$attr->{code}/$attr->{value}");
+            $template->param(
+                ERROR_extended_unique_id_failed_code => $attr->{code},
+                ERROR_extended_unique_id_failed_value => $attr->{value},
+                ERROR_extended_unique_id_failed_description => $attr_info->description()
+            );
         }
     }
   }
@@ -400,11 +410,6 @@ if ((!$nok) and $nodouble and ($op eq 'insert' or $op eq 'save')){
             }
         }
 
-               if ($data{'organisations'}){            
-                       # need to add the members organisations
-                       my @orgs=split(/\|/,$data{'organisations'});
-                       add_member_orgs($borrowernumber,\@orgs);
-               }
         if (C4::Context->preference('ExtendedPatronAttributes') and $input->param('setting_extended_patron_attributes')) {
             C4::Members::Attributes::SetBorrowerAttributes($borrowernumber, $extended_patron_attributes);
         }
@@ -604,7 +609,7 @@ if (C4::Context->userenv && C4::Context->userenv->{'branch'}) {
     $userbranch = C4::Context->userenv->{'branch'};
 }
 
-if (defined ($data{'branchcode'}) and ( $op eq 'modify' || ( $op eq 'add' && $category_type eq 'C' ) )) {
+if (defined ($data{'branchcode'}) and ( $op eq 'modify' || $op eq 'duplicate' || ( $op eq 'add' && $category_type eq 'C' ) )) {
     $userbranch = $data{'branchcode'};
 }
 
@@ -619,42 +624,10 @@ if($no_categories){
     $template->param(no_categories => 1);
 }
 $template->param(no_add => $no_add);
-my $CGIorganisations;
-my $member_of_institution;
-if (C4::Context->preference("memberofinstitution")){
-    my $organisations=get_institutions();
-    my @orgs;
-    my %org_labels;
-    foreach my $organisation (keys %$organisations) {
-        push @orgs,$organisation;
-        $org_labels{$organisation}=$organisations->{$organisation}->{'surname'};
-    }
-    $member_of_institution=1;
-
-    $CGIorganisations = CGI::scrolling_list( -id => 'organisations',
-        -name     => 'organisations',
-        -labels   => \%org_labels,
-        -values   => \@orgs,
-        -size     => 5,
-        -multiple => 'true'
-
-    );
-}
-
 # --------------------------------------------------------------------------------------------------------
 
-my $CGIsort = buildCGIsort("Bsort1","sort1",$data{'sort1'});
-if ($CGIsort) {
-    $template->param(CGIsort1 => $CGIsort);
-}
-$template->param( sort1 => $data{'sort1'});            # shouldn't this be in an "else" statement like the 2nd one?
-
-$CGIsort = buildCGIsort("Bsort2","sort2",$data{'sort2'});
-if ($CGIsort) {
-    $template->param(CGIsort2 => $CGIsort);
-} else {
-    $template->param( sort2 => $data{'sort2'});
-}
+$template->param( sort1 => $data{'sort1'});
+$template->param( sort2 => $data{'sort2'});
 
 if ($nok) {
     foreach my $error (@errors) {
@@ -728,8 +701,6 @@ $template->param(
   category_type =>$category_type,
   modify          => $modify,
   nok     => $nok,#flag to konw if an error 
-  memberofinstution => $member_of_institution,
-  CGIorganisations => $CGIorganisations,
   NoUpdateLogin =>  $NoUpdateLogin
   );
 
@@ -740,7 +711,15 @@ if(defined($data{'contacttitle'})){
   $template->param("contacttitle_" . $data{'contacttitle'} => "SELECTED");
 }
 
-  
+
+my ( $min, $max ) = C4::Members::get_cardnumber_length();
+if ( defined $min ) {
+    $template->param(
+        minlength_cardnumber => $min,
+        maxlength_cardnumber => $max
+    );
+}
+
 output_html_with_http_headers $input, $cookie, $template->output;
 
 sub  parse_extended_patron_attributes {
@@ -797,7 +776,7 @@ sub patron_attributes_form {
         };
         if (exists $attr_hash{$attr_type->code()}) {
             foreach my $attr (@{ $attr_hash{$attr_type->code()} }) {
-                my $newentry = { map { $_ => $entry->{$_} } %$entry };
+                my $newentry = { %$entry };
                 $newentry->{value} = $attr->{value};
                 $newentry->{password} = $attr->{password};
                 $newentry->{use_dropdown} = 0;
@@ -811,7 +790,7 @@ sub patron_attributes_form {
             }
         } else {
             $i++;
-            my $newentry = { map { $_ => $entry->{$_} } %$entry };
+            my $newentry = { %$entry };
             if ($attr_type->authorised_value_category()) {
                 $newentry->{use_dropdown} = 1;
                 $newentry->{auth_val_loop} = GetAuthorisedValues($attr_type->authorised_value_category());