X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=members%2Fmemberentry.pl;h=063e4891ff5378be8d67d4abfa6c01a6fc7df96a;hb=6a37aaf010e3bce1cc28480e97e4f3631ed04cc1;hp=16fde6fe5d4effcc47f75e715857c6da7f7194af;hpb=378e06dacbfc8e1920c56c6c38693b6eef323953;p=koha_fer diff --git a/members/memberentry.pl b/members/memberentry.pl index 16fde6fe5d..063e4891ff 100755 --- a/members/memberentry.pl +++ b/members/memberentry.pl @@ -13,12 +13,13 @@ # 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., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA +# 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. # pragma use strict; +use warnings; # external modules use CGI; @@ -37,6 +38,7 @@ use C4::Input; use C4::Log; use C4::Letters; use C4::Branch; # GetBranches +use C4::Form::MessagingPreferences; use vars qw($debug); @@ -57,22 +59,25 @@ my ($template, $loggedinuser, $cookie) authnotrequired => 0, flagsrequired => {borrowers => 1}, debug => ($debug) ? 1 : 0, - }); -my $guarantorid=$input->param('guarantorid'); -my $borrowernumber=$input->param('borrowernumber'); -my $actionType=$input->param('actionType') || ''; -my $modify=$input->param('modify'); -my $delete=$input->param('delete'); -my $op=$input->param('op'); -my $destination=$input->param('destination'); -my $cardnumber=$input->param('cardnumber'); -my $check_member=$input->param('check_member'); -my $name_city=$input->param('name_city'); -my $nodouble=$input->param('nodouble'); -my $select_city=$input->param('select_city'); -my $nok=$input->param('nok'); -my $guarantorinfo=$input->param('guarantorinfo'); -my $step=$input->param('step') || 0; + }); +my $guarantorid = $input->param('guarantorid'); +my $borrowernumber = $input->param('borrowernumber'); +my $actionType = $input->param('actionType') || ''; +my $modify = $input->param('modify'); +my $delete = $input->param('delete'); +my $op = $input->param('op'); +my $destination = $input->param('destination'); +my $cardnumber = $input->param('cardnumber'); +my $check_member = $input->param('check_member'); +my $nodouble = $input->param('nodouble'); +$nodouble = 1 if $op eq 'modify'; # FIXME hack to represent fact that if we're + # modifying an existing patron, it ipso facto + # isn't a duplicate. Marking FIXME because this + # script needs to be refactored. +my $select_city = $input->param('select_city'); +my $nok = $input->param('nok'); +my $guarantorinfo = $input->param('guarantorinfo'); +my $step = $input->param('step') || 0; my @errors; my $default_city; # $check_categorytype contains the value of duplicate borrowers category type to redirect in good template in step =2 @@ -94,52 +99,85 @@ foreach (@field_check) { $template->param( "mandatory$_" => 1); } $template->param("add"=>1) if ($op eq 'add'); -$template->param("checked" => 1) if ($nodouble eq 1); -($borrower_data = GetMember($borrowernumber,'borrowernumber')) if ($op eq 'modify' or $op eq 'save'); -my $categorycode = $input->param('categorycode') || $borrower_data->{'categorycode'}; +$template->param("checked" => 1) if (defined($nodouble) && $nodouble eq 1); +($borrower_data = GetMember( 'borrowernumber'=>$borrowernumber )) if ($op eq 'modify' or $op eq 'save'); +my $categorycode = $input->param('categorycode') || $borrower_data->{'categorycode'}; my $category_type = $input->param('category_type'); my $new_c_type = $category_type; #if we have input param, then we've already chosen the cat_type. unless ($category_type or !($categorycode)){ - my $borrowercategory= GetBorrowercategory($categorycode); - $category_type = $borrowercategory->{'category_type'}; - my $category_name = $borrowercategory->{'description'}; - $template->param("categoryname"=>$category_name); + my $borrowercategory = GetBorrowercategory($categorycode); + $category_type = $borrowercategory->{'category_type'}; + my $category_name = $borrowercategory->{'description'}; + $template->param("categoryname"=>$category_name); } $category_type="A" unless $category_type; # FIXME we should display a error message instead of a 500 error ! # if a add or modify is requested => check validity of data. %data = %$borrower_data if ($borrower_data); +# initialize %newdata my %newdata; # comes from $input->param() if ($op eq 'insert' || $op eq 'modify' || $op eq 'save') { my @names= ($borrower_data && $op ne 'save') ? keys %$borrower_data : $input->param(); foreach my $key (@names) { - $newdata{$key} = $input->param($key) if (defined $input->param($key)); - $newdata{$key} =~ s/\"/"/gg unless $key eq 'borrowernotes' or $key eq 'opacnote'; + if (defined $input->param($key)) { + $newdata{$key} = $input->param($key); + $newdata{$key} =~ s/\"/"/g unless $key eq 'borrowernotes' or $key eq 'opacnote'; + } + } + my $dateobject = C4::Dates->new(); + my $syspref = $dateobject->regexp(); # same syspref format for all 3 dates + my $iso = $dateobject->regexp('iso'); # + foreach (qw(dateenrolled dateexpiry dateofbirth)) { + next unless exists $newdata{$_}; + my $userdate = $newdata{$_} or next; + if ($userdate =~ /$syspref/) { + $newdata{$_} = format_date_in_iso($userdate); # if they match syspref format, then convert to ISO + } elsif ($userdate =~ /$iso/) { + warn "Date $_ ($userdate) is already in ISO format"; + } else { + ($userdate eq '0000-00-00') and warn "Data error: $_ is '0000-00-00'"; + $template->param( "ERROR_$_" => 1 ); # else ERROR! + push(@errors,"ERROR_$_"); + } } - my $dateobject = C4::Dates->new(); - my $syspref = $dateobject->regexp(); # same syspref format for all 3 dates - my $iso = $dateobject->regexp('iso'); # - foreach (qw(dateenrolled dateexpiry dateofbirth)) { - my $userdate = $newdata{$_} or next; - if ($userdate =~ /$syspref/) { - $newdata{$_} = format_date_in_iso($userdate); # if they match syspref format, then convert to ISO - } elsif ($userdate =~ /$iso/) { - warn "Date $_ ($userdate) is already in ISO format"; - } else { - ($userdate eq '0000-00-00') and warn "Data error: $_ is '0000-00-00'"; - $template->param( "ERROR_$_" => 1 ); # else ERROR! - push(@errors,"ERROR_$_"); - } - } # check permission to modify login info. - if (ref($borrower_data) && ($borrower_data->{'category_type'} eq 'S') && ! (C4::Auth::haspermission($dbh,$userenv->{'id'},{'staffaccess'=>1})) ) { - $NoUpdateLogin =1; - } + if (ref($borrower_data) && ($borrower_data->{'category_type'} eq 'S') && ! (C4::Auth::haspermission($userenv->{'id'},{'staffaccess'=>1})) ) { + $NoUpdateLogin = 1; + } +} + +# remove keys from %newdata that ModMember() doesn't like +{ + my @keys_to_delete = ( + qr/^BorrowerMandatoryField$/, + qr/^category_type$/, + qr/^check_member$/, + qr/^destination$/, + qr/^nodouble$/, + qr/^op$/, + qr/^save$/, + qr/^select_roadtype$/, + qr/^updtype$/, + qr/^SMSnumber$/, + qr/^setting_extended_patron_attributes$/, + qr/^setting_messaging_prefs$/, + qr/^digest$/, + qr/^modify$/, + qr/^step$/, + qr/^\d+$/, + qr/^\d+-DAYS/, + qr/^patron_attr_/, + ); + for my $regexp (@keys_to_delete) { + for (keys %newdata) { + delete($newdata{$_}) if /$regexp/; + } + } } #############test for member being unique ############# -if ($op eq 'insert'){ +if (($op eq 'insert') and !$nodouble){ my $category_type_send=$category_type if ($category_type eq 'I'); my $check_category; # recover the category code of the doublon suspect borrowers # ($result,$categorycode) = checkuniquemember($collectivity,$surname,$firstname,$dateofbirth) @@ -149,8 +187,10 @@ if ($op eq 'insert'){ ($newdata{firstname} ? $newdata{firstname} : $data{firstname} ), ($newdata{dateofbirth} ? $newdata{dateofbirth} : $data{dateofbirth}) ); - - # recover the category type if the borrowers is a doublon + if(!$check_member){ + $nodouble = 1; + } + # recover the category type if the borrowers is a doublon if ($check_category) { my $tmpborrowercategory=GetBorrowercategory($check_category); $check_categorytype=$tmpborrowercategory->{'category_type'}; @@ -158,35 +198,36 @@ if ($op eq 'insert'){ } #recover all data from guarantor address phone ,fax... -if (($category_type eq 'C' || $category_type eq 'P') and $guarantorid ne '' ){ - my $guarantordata=GetMember($guarantorid); - $guarantorinfo=$guarantordata->{'surname'}." , ".$guarantordata->{'firstname'}; - if (($data{'contactname'} eq '' or $data{'contactname'} ne $guarantordata->{'surname'})) { - $data{'contactfirstname'}= $guarantordata->{'firstname'}; - $data{'contactname'} = $guarantordata->{'surname'}; - $data{'contacttitle'} = $guarantordata->{'title'}; - foreach (qw(streetnumber address streettype address2 zipcode city phone phonepro mobile fax email emailpro branchcode)) { - $data{$_} = $guarantordata->{$_}; - } - } +if ( $guarantorid and ( $category_type eq 'C' || $category_type eq 'P' )) { + if (my $guarantordata=GetMember(borrowernumber => $guarantorid)) { + $guarantorinfo=$guarantordata->{'surname'}." , ".$guarantordata->{'firstname'}; + if ( !defined($data{'contactname'}) or $data{'contactname'} eq '' or + $data{'contactname'} ne $guarantordata->{'surname'} ) { + $newdata{'contactfirstname'}= $guarantordata->{'firstname'}; + $newdata{'contactname'} = $guarantordata->{'surname'}; + $newdata{'contacttitle'} = $guarantordata->{'title'}; + foreach (qw(streetnumber address streettype address2 + zipcode country city phone phonepro mobile fax email emailpro branchcode)) { + $newdata{$_} = $guarantordata->{$_}; + } + } + } } -###############test to take the right zipcode and city name ############## -if ($guarantorid eq '') { +###############test to take the right zipcode, country and city name ############## +if (!defined($guarantorid) or $guarantorid eq '' or $guarantorid eq '0') { # set only if parameter was passed from the form $newdata{'city'} = $input->param('city') if defined($input->param('city')); $newdata{'zipcode'} = $input->param('zipcode') if defined($input->param('zipcode')); + $newdata{'country'} = $input->param('country') if defined($input->param('country')); } #builds default userid if ( (defined $newdata{'userid'}) && ($newdata{'userid'} eq '')){ - my $onefirstnameletter = substr($data{'firstname'},0,1); - my $fivesurnameletter = substr($data{'surname'},0,9); - $newdata{'userid'}=lc($onefirstnameletter.$fivesurnameletter); + $newdata{'userid'} = Generate_Userid($borrowernumber, $newdata{'firstname'}, $newdata{'surname'}); } $debug and warn join "\t", map {"$_: $newdata{$_}"} qw(dateofbirth dateenrolled dateexpiry); -my $loginexist=0; my $extended_patron_attributes = (); if ($op eq 'save' || $op eq 'insert'){ if (checkcardnumber($newdata{cardnumber},$newdata{borrowernumber})){ @@ -202,8 +243,13 @@ if ($op eq 'save' || $op eq 'insert'){ $template->param('ERROR_age_limitations' => "$low to $high"); } } + + if($newdata{surname} && C4::Context->preference('uppercasesurnames')) { + $newdata{'surname'} = uc($newdata{'surname'}); + } + if (C4::Context->preference("IndependantBranches")) { - if ($userenv && $userenv->{flags} != 1){ + if ($userenv && $userenv->{flags} % 2 != 1){ $debug and print STDERR " $newdata{'branchcode'} : ".$userenv->{flags}.":".$userenv->{branch}; unless (!$newdata{'branchcode'} || $userenv->{branch} eq $newdata{'branchcode'}){ push @errors, "ERROR_branch"; @@ -213,11 +259,10 @@ if ($op eq 'save' || $op eq 'insert'){ # Check if the userid is unique unless (Check_Userid($newdata{'userid'},$borrowernumber)) { push @errors, "ERROR_login_exist"; - $loginexist=1; } my $password = $input->param('password'); - push @errors, "ERROR_short_password" if( $password && $minpw & (length($password) < $minpw ) ); + push @errors, "ERROR_short_password" if( $password && $minpw && $password ne '****' && (length($password) < $minpw) ); if (C4::Context->preference('ExtendedPatronAttributes')) { $extended_patron_attributes = parse_extended_patron_attributes($input); @@ -230,17 +275,20 @@ if ($op eq 'save' || $op eq 'insert'){ } } -if ($op eq 'modify' || $op eq 'insert'){ - unless ($newdata{'dateexpiry'}){ - my $arg2 = $newdata{'dateenrolled'} || C4::Dates->today('iso'); - $newdata{'dateexpiry'} = GetExpiryDate($newdata{'categorycode'},$arg2); - } +if ( ($op eq 'modify' || $op eq 'insert' || $op eq 'save') and ($step == 0 or $step == 3 )){ + if (exists ($newdata{'dateexpiry'}) && !($newdata{'dateexpiry'})){ + my $arg2 = $newdata{'dateenrolled'} || C4::Dates->today('iso'); + $newdata{'dateexpiry'} = GetExpiryDate($newdata{'categorycode'},$arg2); + } } -### Error checks should happen before this line. +if ( ( defined $input->param('SMSnumber') ) && ( $input->param('SMSnumber') ne $newdata{'mobile'} ) ) { + $newdata{smsalertnumber} = $input->param('SMSnumber'); +} +### Error checks should happen before this line. $nok = $nok || scalar(@errors); -if ((!$nok) and ($op eq 'insert' or $op eq 'save')){ +if ((!$nok) and $nodouble and ($op eq 'insert' or $op eq 'save')){ $debug and warn "$op dates: " . join "\t", map {"$_: $newdata{$_}"} qw(dateofbirth dateenrolled dateexpiry); if ($op eq 'insert'){ # we know it's not a duplicate borrowernumber or there would already be an error @@ -281,15 +329,24 @@ if ((!$nok) and ($op eq 'insert' or $op eq 'save')){ if (C4::Context->preference('ExtendedPatronAttributes') and $input->param('setting_extended_patron_attributes')) { C4::Members::Attributes::SetBorrowerAttributes($borrowernumber, $extended_patron_attributes); } + if (C4::Context->preference('EnhancedMessagingPreferences') and $input->param('setting_messaging_prefs')) { + C4::Form::MessagingPreferences::handle_form_action($input, { borrowernumber => $borrowernumber }, $template); + } } elsif ($op eq 'save'){ if ($NoUpdateLogin) { delete $newdata{'password'}; delete $newdata{'userid'}; } - &ModMember(%newdata); + &ModMember(%newdata) unless scalar(keys %newdata) <= 1; # bug 4508 - avoid crash if we're not + # updating any columns in the borrowers table, + # which can happen if we're only editing the + # patron attributes or messaging preferences sections if (C4::Context->preference('ExtendedPatronAttributes') and $input->param('setting_extended_patron_attributes')) { C4::Members::Attributes::SetBorrowerAttributes($borrowernumber, $extended_patron_attributes); } + if (C4::Context->preference('EnhancedMessagingPreferences') and $input->param('setting_messaging_prefs')) { + C4::Form::MessagingPreferences::handle_form_action($input, { borrowernumber => $borrowernumber }, $template); + } } print scalar ($destination eq "circ") ? $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber") : @@ -302,42 +359,41 @@ if ($delete){ exit; # same as above } -if ($nok){ - $op="add" if ($op eq "insert"); - $op="modify" if ($op eq "save"); - %data=%newdata; - $template->param( updtype => ($op eq 'add' ?'I':'M')); # used to check for $op eq "insert"... but we just changed $op! - unless ($step){ - $template->param( step_1 => 1,step_2 => 1,step_3 => 1, step_4 => 1); - } +if ($nok or !$nodouble){ + $op="add" if ($op eq "insert"); + $op="modify" if ($op eq "save"); + %data=%newdata; + $template->param( updtype => ($op eq 'add' ?'I':'M')); # used to check for $op eq "insert"... but we just changed $op! + unless ($step){ + $template->param( step_1 => 1,step_2 => 1,step_3 => 1, step_4 => 1, step_5 => 1, step_6 => 1); + } } if (C4::Context->preference("IndependantBranches")) { - my $userenv = C4::Context->userenv; - if ($userenv->{flags} != 1 && $data{branchcode}){ - unless ($userenv->{branch} eq $data{'branchcode'}){ - print $input->redirect("/cgi-bin/koha/members/members-home.pl"); - exit; + my $userenv = C4::Context->userenv; + if ($userenv->{flags} % 2 != 1 && $data{branchcode}){ + unless ($userenv->{branch} eq $data{'branchcode'}){ + print $input->redirect("/cgi-bin/koha/members/members-home.pl"); + exit; + } } - } } if ($op eq 'add'){ - my $arg2 = $newdata{'dateenrolled'} || C4::Dates->today('iso'); - $data{'dateexpiry'} = GetExpiryDate($newdata{'categorycode'},$arg2); - $template->param( updtype => 'I',step_1=>1,step_2=>1,step_3=>1, step_4 => 1); - -} + $template->param( updtype => 'I', step_1=>1, step_2=>1, step_3=>1, step_4=>1, step_5 => 1, step_6 => 1); +} if ($op eq "modify") { - $template->param( updtype => 'M',modify => 1 ); - $template->param( step_1=>1,step_2=>1,step_3=>1, step_4 => 1) unless $step; + $template->param( updtype => 'M',modify => 1 ); + $template->param( step_1=>1, step_2=>1, step_3=>1, step_4=>1, step_5 => 1, step_6 => 1) unless $step; } # my $cardnumber=$data{'cardnumber'}; $data{'cardnumber'}=fixup_cardnumber($data{'cardnumber'}) if $op eq 'add'; -if ($data{'sex'} eq 'F'){ - $template->param(female => 1); +if(!defined($data{'sex'})){ + $template->param( none => 1); +} elsif($data{'sex'} eq 'F'){ + $template->param( female => 1); } elsif ($data{'sex'} eq 'M'){ - $template->param(male => 1); + $template->param( male => 1); } else { - $template->param(none => 1); + $template->param( none => 1); } ##Now all the data to modify a member. @@ -356,39 +412,54 @@ if ($ethnicitycategoriescount>=0) { } my @typeloop; +my $no_categories = 1; +my $no_add; foreach (qw(C A S P I X)) { my $action="WHERE category_type=?"; ($categories,$labels)=GetborCatFromCatType($_,$action); + if(scalar(@$categories) > 0){ $no_categories = 0; } my @categoryloop; foreach my $cat (@$categories){ push @categoryloop,{'categorycode' => $cat, 'categoryname' => $labels->{$cat}, - 'categorycodeselected' => ($cat eq $borrower_data->{'categorycode'} || $cat eq $categorycode), + 'categorycodeselected' => ((defined($borrower_data->{'categorycode'}) && + $cat eq $borrower_data->{'categorycode'}) + || (defined($categorycode) && $cat eq $categorycode)), }; } my %typehash; $typehash{'typename'}=$_; + my $typedescription = "typename_".$typehash{'typename'}; $typehash{'categoryloop'}=\@categoryloop; push @typeloop,{'typename' => $_, + $typedescription => 1, 'categoryloop' => \@categoryloop}; -} -$template->param('typeloop' => \@typeloop); - +} +$template->param('typeloop' => \@typeloop, + no_categories => $no_categories); +if($no_categories){ $no_add = 1; } # test in city -$select_city=getidcity($data{'city'}) if ($guarantorid ne '0'); +if ( $guarantorid ) { + $select_city = getidcity($data{city}); +} ($default_city=$select_city) if ($step eq 0); -if ($select_city eq '' ){ +if (!defined($select_city) or $select_city eq '' ){ $default_city = &getidcity($data{'city'}); } -my($cityid); -($cityid,$name_city)=GetCities(); -$template->param( city_cgipopup => 1) if ($cityid ); -my $citypopup = CGI::popup_menu(-name=>'select_city', - -id => 'select_city', - '-values' =>$cityid, - -labels=>$name_city, - -default=>$default_city, - ); + +my $city_arrayref = GetCities(); +if (@{$city_arrayref} ) { + $template->param( city_cgipopup => 1); + + if ($default_city) { # flag the current or default val + for my $city ( @{$city_arrayref} ) { + if ($default_city == $city->{cityid}) { + $city->{selected} = 1; + last; + } + } + } +} my $default_roadtype; $default_roadtype=$data{'streettype'} ; @@ -413,12 +484,12 @@ my $borrotitlepopup = CGI::popup_menu(-name=>'title', -default=>$default_borrowertitle ); -my @relationships = split /,|\|/,C4::Context->preference('BorrowerRelationship'); +my @relationships = split /,|\|/, C4::Context->preference('BorrowerRelationship'); my @relshipdata; while (@relationships) { my $relship = shift @relationships || ''; my %row = ('relationship' => $relship); - if ($data{'relationship'} eq $relship) { + if (defined($data{'relationship'}) and $data{'relationship'} eq $relship) { $row{'selected'}=' selected'; } else { $row{'selected'}=''; @@ -454,22 +525,23 @@ my %select_branches; my $onlymine=(C4::Context->preference('IndependantBranches') && C4::Context->userenv && - C4::Context->userenv->{flags} !=1 && + C4::Context->userenv->{flags} % 2 !=1 && C4::Context->userenv->{branch}?1:0); my $branches=GetBranches($onlymine); my $default; - +my $CGIbranch; for my $branch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) { push @select_branch,$branch; $select_branches{$branch} = $branches->{$branch}->{'branchname'}; $default = C4::Context->userenv->{'branch'} if (C4::Context->userenv && C4::Context->userenv->{'branch'}); } +if(scalar(@select_branch) > 0){ # -------------------------------------------------------------------------------------------------------- #in modify mod :default value from $CGIbranch comes from borrowers table #in add mod: default value come from branches table (ip correspendence) $default=$data{'branchcode'} if ($op eq 'modify' || ($op eq 'add' && $category_type eq 'C')); -my $CGIbranch = CGI::scrolling_list(-id => 'branchcode', +$CGIbranch = CGI::scrolling_list(-id => 'branchcode', -name => 'branchcode', -values => \@select_branch, -labels => \%select_branches, @@ -478,6 +550,17 @@ my $CGIbranch = CGI::scrolling_list(-id => 'branchcode', -multiple =>0, -default => $default, ); +} + +if(!$CGIbranch){ + $no_add = 1; + $template->param(no_branches => 1); +} +if($no_categories){ + $no_add = 1; + $template->param(no_categories => 1); +} +$template->param(no_add => $no_add); my $CGIorganisations; my $member_of_institution; if (C4::Context->preference("memberofinstitution")){ @@ -489,7 +572,7 @@ if (C4::Context->preference("memberofinstitution")){ $org_labels{$organisation}=$organisations->{$organisation}->{'surname'}; } $member_of_institution=1; - + $CGIorganisations = CGI::scrolling_list( -id => 'organisations', -name => 'organisations', -labels => \%org_labels, @@ -500,20 +583,19 @@ if (C4::Context->preference("memberofinstitution")){ ); } - # -------------------------------------------------------------------------------------------------------- my $CGIsort = buildCGIsort("Bsort1","sort1",$data{'sort1'}); if ($CGIsort) { - $template->param(CGIsort1 => $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); + $template->param(CGIsort2 => $CGIsort); } else { - $template->param( sort2 => $data{'sort2'}); + $template->param( sort2 => $data{'sort2'}); } if ($nok) { @@ -525,7 +607,7 @@ if ($nok) { #Formatting data for display -if ($data{'dateenrolled'} eq ''){ +if (!defined($data{'dateenrolled'}) or $data{'dateenrolled'} eq ''){ $data{'dateenrolled'}=C4::Dates->today('iso'); } if (C4::Context->preference('uppercasesurnames')) { @@ -542,12 +624,23 @@ if (C4::Context->preference('ExtendedPatronAttributes')) { patron_attributes_form($template, $borrowernumber); } +if (C4::Context->preference('EnhancedMessagingPreferences')) { + if ($op eq 'add') { + C4::Form::MessagingPreferences::set_form_values({ categorycode => $categorycode }, $template); + } else { + C4::Form::MessagingPreferences::set_form_values({ borrowernumber => $borrowernumber }, $template); + } + $template->param(SMSSendDriver => C4::Context->preference("SMSSendDriver")); + $template->param(SMSnumber => defined $data{'smsalertnumber'} ? $data{'smsalertnumber'} : $data{'mobile'}); +} + $template->param( "showguarantor" => ($category_type=~/A|I|S|X/) ? 0 : 1); # associate with step to know where you are $debug and warn "memberentry step: $step"; $template->param(%data); $template->param( "step_$step" => 1) if $step; # associate with step to know where u are $template->param( step => $step ) if $step; # associate with step to know where u are $template->param( debug => $debug ) if $debug; + $template->param( BorrowerMandatoryField => C4::Context->preference("BorrowerMandatoryField"),#field to test with javascript category_type => $category_type,#to know the category type of the borrower @@ -556,15 +649,16 @@ $template->param( "$category_type" => 1,# associate with step to know where u are destination => $destination,#to know wher u come from and wher u must go in redirect check_member => $check_member,#to know if the borrower already exist(=>1) or not (=>0) - flags =>$data{'flags'}, - "op$op" => 1, + "op$op" => 1); + +$template->param(CGIbranch=>$CGIbranch) if ($CGIbranch); +$template->param( nodouble => $nodouble, - borrowernumber => $borrowernumber,#register number - "contacttitle_".$data{'contacttitle'} => "SELECTED" , - guarantorid => $borrower_data ? $borrower_data->{'guarantorid'} : $guarantorid, + borrowernumber => $borrowernumber, #register number + guarantorid => (($borrower_data->{'guarantorid'})) ? $borrower_data->{'guarantorid'} : $guarantorid, ethcatpopup => $ethcatpopup, relshiploop => \@relshipdata, - citypopup => $citypopup, + city_loop => $city_arrayref, roadpopup => $roadpopup, borrotitlepopup => $borrotitlepopup, guarantorinfo => $guarantorinfo, @@ -572,13 +666,21 @@ $template->param( dateformat => C4::Dates->new()->visual(), C4::Context->preference('dateformat') => 1, check_categorytype =>$check_categorytype,#to recover the category type with checkcategorytype function + category_type =>$category_type, modify => $modify, nok => $nok,#flag to konw if an error - CGIbranch => $CGIbranch, memberofinstution => $member_of_institution, CGIorganisations => $CGIorganisations, NoUpdateLogin => $NoUpdateLogin ); + +if(defined($data{'flags'})){ + $template->param(flags=>$data{'flags'}); +} +if(defined($data{'contacttitle'})){ + $template->param("contacttitle_" . $data{'contacttitle'} => "SELECTED"); +} + output_html_with_http_headers $input, $cookie, $template->output; @@ -592,7 +694,7 @@ sub parse_extended_patron_attributes { my $value = $input->param($key); next unless defined($value) and $value ne ''; my $password = $input->param("${key}_password"); - my $code = $input->param("${key}_code"); + my $code = $input->param("${key}_code"); next if exists $dups{$code}->{$value}; $dups{$code}->{$value} = 1; push @attr, { code => $code, value => $value, password => $password };