X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=members%2Fmemberentry.pl;h=0193cc3777799bd82c86be7486295351eb30dc55;hb=a925b07f7b5c182f2c8050886d58e08ce065eff3;hp=166302006bffa801e1e21a529ca1b90ec8312e6d;hpb=086a0007d2d484ecbd6ae6d60317ed4f0d3434b1;p=koha-ffzg.git diff --git a/members/memberentry.pl b/members/memberentry.pl index 166302006b..0193cc3777 100755 --- a/members/memberentry.pl +++ b/members/memberentry.pl @@ -23,41 +23,33 @@ use Modern::Perl; # external modules use CGI qw ( -utf8 ); -use List::MoreUtils qw/uniq/; # internal modules -use C4::Auth; +use C4::Auth qw( get_template_and_user haspermission ); use C4::Context; -use C4::Output; -use C4::Members; -use C4::Members::Attributes; -use C4::Members::AttributeTypes; -use C4::Koha; -use C4::Log; -use C4::Letters; +use C4::Output qw( output_and_exit output_and_exit_if_error output_html_with_http_headers ); +use C4::Members qw( checkcardnumber get_cardnumber_length ); +use C4::Koha qw( GetAuthorisedValues ); +use C4::Letters qw( GetPreparedLetter EnqueueLetter SendQueuedMessages ); use C4::Form::MessagingPreferences; use Koha::AuthUtils; use Koha::AuthorisedValues; -use Koha::Patron::Debarments; +use Koha::Email; +use Koha::Patron::Debarments qw( AddDebarment DelDebarment ); +use Koha::Patron::Restriction::Types; use Koha::Cities; -use Koha::DateUtils; +use Koha::DateUtils qw( dt_from_string ); use Koha::Libraries; use Koha::Patrons; +use Koha::Patron::Attribute::Types; use Koha::Patron::Categories; use Koha::Patron::HouseboundRole; use Koha::Patron::HouseboundRoles; +use Koha::Plugins; use Koha::Token; -use Email::Valid; use Koha::SMS::Providers; -use vars qw($debug); - -BEGIN { - $debug = $ENV{DEBUG} || 0; -} - -my $input = new CGI; -($debug) or $debug = $input->param('debug') || 0; +my $input = CGI->new; my %data; my $dbh = C4::Context->dbh; @@ -66,9 +58,7 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user({template_name => "members/memberentrygen.tt", query => $input, type => "intranet", - authnotrequired => 0, flagsrequired => {borrowers => 'edit_borrowers'}, - debug => ($debug) ? 1 : 0, }); my $borrowernumber = $input->param('borrowernumber'); @@ -79,11 +69,10 @@ if ( $borrowernumber and not $patron ) { } if ( C4::Context->preference('SMSSendDriver') eq 'Email' ) { - my @providers = Koha::SMS::Providers->search(); + my @providers = Koha::SMS::Providers->search( {}, { order_by => 'name' } )->as_list; $template->param( sms_providers => \@providers ); } -my $guarantorid = $input->param('guarantorid'); my $actionType = $input->param('actionType') || ''; my $modify = $input->param('modify'); my $delete = $input->param('delete'); @@ -99,16 +88,38 @@ $nodouble = 1 if ($op eq 'modify' or $op eq 'duplicate'); # FIXME hack to rep # isn't a duplicate. Marking FIXME because this # script needs to be refactored. my $nok = $input->param('nok'); -my $guarantorinfo = $input->param('guarantorinfo'); my $step = $input->param('step') || 0; my @errors; my $borrower_data; my $NoUpdateLogin; +my $NoUpdateEmail; +my $CanUpdatePasswordExpiration; my $userenv = C4::Context->userenv; +my @messages; + +## Deal with guarantor stuff +$template->param( relationships => $patron->guarantor_relationships ) if $patron; + +my @relations = split /\|/, C4::Context->preference('borrowerRelationship'), -1; +@relations = ('') unless @relations; +my $empty_relationship_allowed = grep {$_ eq ""} @relations; +$template->param( empty_relationship_allowed => $empty_relationship_allowed ); + +my $guarantor_id = $input->param('guarantor_id'); +my $guarantor = undef; +$guarantor = Koha::Patrons->find( $guarantor_id ) if $guarantor_id; +$template->param( guarantor => $guarantor ); + +my @delete_guarantor = $input->multi_param('delete_guarantor'); +foreach my $id ( @delete_guarantor ) { + my $r = Koha::Patron::Relationships->find( $id ); + $r->delete() if $r; +} ## Deal with debarments $template->param( - debarments => scalar GetDebarments( { borrowernumber => $borrowernumber } ) ); + restriction_types => scalar Koha::Patron::Restriction::Types->search() +); my @debarments_to_remove = $input->multi_param('remove_debarment'); foreach my $d ( @debarments_to_remove ) { DelDebarment( $d ); @@ -124,7 +135,7 @@ if ( $input->param('add_debarment') ) { AddDebarment( { borrowernumber => $borrowernumber, - type => 'MANUAL', + type => scalar $input->param('debarred_type') // 'MANUAL', comment => scalar $input->param('debarred_comment'), expiration => $expiration, } @@ -137,36 +148,37 @@ $template->param("uppercasesurnames" => C4::Context->preference('uppercasesurnam my $check_BorrowerMandatoryField=C4::Context->preference("BorrowerMandatoryField"); my @field_check=split(/\|/,$check_BorrowerMandatoryField); foreach (@field_check) { - $template->param( "mandatory$_" => 1); + $template->param( "mandatory$_" => 1 ); } # function to designate unwanted fields my $check_BorrowerUnwantedField=C4::Context->preference("BorrowerUnwantedField"); @field_check=split(/\|/,$check_BorrowerUnwantedField); foreach (@field_check) { next unless m/\w/o; - $template->param( "no$_" => 1); + $template->param( "no$_" => 1 ); } $template->param( "add" => 1 ) if ( $op eq 'add' ); $template->param( "quickadd" => 1 ) if ( $quickadd ); $template->param( "duplicate" => 1 ) if ( $op eq 'duplicate' ); $template->param( "checked" => 1 ) if ( defined($nodouble) && $nodouble eq 1 ); if ( $op eq 'modify' or $op eq 'save' or $op eq 'duplicate' ) { - my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in"; + my $logged_in_user = Koha::Patrons->find( $loggedinuser ); output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } ); + # check permission to modify email info. + if ( $patron->is_superlibrarian && !$logged_in_user->is_superlibrarian ) { + $NoUpdateEmail = 1; + } + if ($logged_in_user->is_superlibrarian) { + $CanUpdatePasswordExpiration = 1; + } + $borrower_data = $patron->unblessed; - $borrower_data->{category_type} = $patron->category->category_type; } my $categorycode = $input->param('categorycode') || $borrower_data->{'categorycode'}; -my $category_type = $input->param('category_type') || ''; -unless ($category_type or !($categorycode)){ - my $borrowercategory = Koha::Patron::Categories->find($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 ! +my $category = Koha::Patron::Categories->find($categorycode); +$template->param( patron_category => $category ); # if a add or modify is requested => check validity of data. %data = %$borrower_data if ($borrower_data); @@ -181,21 +193,8 @@ if ( $op eq 'insert' || $op eq 'modify' || $op eq 'save' || $op eq 'duplicate' ) } } - foreach (qw(dateenrolled dateexpiry dateofbirth)) { - next unless exists $newdata{$_}; - my $userdate = $newdata{$_} or next; - - my $formatteddate = eval { output_pref({ dt => dt_from_string( $userdate ), dateformat => 'iso', dateonly => 1 } ); }; - if ( $formatteddate ) { - $newdata{$_} = $formatteddate; - } else { - ($userdate eq '0000-00-00') and warn "Data error: $_ is '0000-00-00'"; - $template->param( "ERROR_$_" => 1 ); - push(@errors,"ERROR_$_"); - } - } - # check permission to modify login info. - if (ref($borrower_data) && ($borrower_data->{'category_type'} eq 'S') && ! (C4::Auth::haspermission($userenv->{'id'},{'staffaccess'=>1})) ) { + # check permission to modify login info. + if (ref($borrower_data) && ($category->category_type eq 'S') && ! (C4::Auth::haspermission($userenv->{'id'},{'staffaccess'=>1})) ) { $NoUpdateLogin = 1; } } @@ -203,8 +202,8 @@ if ( $op eq 'insert' || $op eq 'modify' || $op eq 'save' || $op eq 'duplicate' ) # remove keys from %newdata that is not part of patron's attributes { my @keys_to_delete = ( + qr/^(borrowernumber|date_renewed|debarred|debarredcomment|flags|privacy|updated_on|lastseen|login_attempts|overdrive_auth_token|anonymized)$/, # Bug 28935 qr/^BorrowerMandatoryField$/, - qr/^category_type$/, qr/^check_member$/, qr/^destination$/, qr/^nodouble$/, @@ -221,10 +220,16 @@ if ( $op eq 'insert' || $op eq 'modify' || $op eq 'save' || $op eq 'duplicate' ) qr/^\d+-DAYS/, qr/^patron_attr_/, qr/^csrf_token$/, - qr/^add_debarment$/, qr/^debarred_expiration$/, # We already dealt with debarments previously + qr/^add_debarment$/, qr/^debarred_comment$/,qr/^debarred_expiration$/, qr/^debarred_type$/, qr/^remove_debarment$/, # We already dealt with debarments previously qr/^housebound_chooser$/, qr/^housebound_deliverer$/, qr/^select_city$/, + qr/^new_guarantor_/, + qr/^guarantor_firstname$/, + qr/^guarantor_surname$/, + qr/^delete_guarantor$/, ); + push @keys_to_delete, map { qr/^$_$/ } split( /\s*\|\s*/, C4::Context->preference('BorrowerUnwantedField') || q{} ); + push @keys_to_delete, qr/^password_expiration_date$/ unless $CanUpdatePasswordExpiration; for my $regexp (@keys_to_delete) { for (keys %newdata) { delete($newdata{$_}) if /$regexp/; @@ -234,37 +239,29 @@ if ( $op eq 'insert' || $op eq 'modify' || $op eq 'save' || $op eq 'duplicate' ) # Test uniqueness of surname, firstname and dateofbirth if ( ( $op eq 'insert' ) and !$nodouble ) { + my @dup_fields = split '\|', C4::Context->preference('PatronDuplicateMatchingAddFields'); my $conditions; - $conditions->{surname} = $newdata{surname} if $newdata{surname}; - if ( $category_type ne 'I' ) { - $conditions->{firstname} = $newdata{firstname} if $newdata{firstname}; - $conditions->{dateofbirth} = $newdata{dateofbirth} if $newdata{dateofbirth}; + for my $f ( @dup_fields ) { + $conditions->{$f} = $newdata{$f} if $newdata{$f}; } $nodouble = 1; my $patrons = Koha::Patrons->search($conditions); # FIXME Should be search_limited? if ( $patrons->count > 0) { $nodouble = 0; $check_member = $patrons->next->borrowernumber; - } -} - #recover all data from guarantor address phone ,fax... -if ( $guarantorid ) { - if (my $guarantor = Koha::Patrons->find( $guarantorid )) { - my $guarantordata = $guarantor->unblessed; - $category_type = $guarantordata->{categorycode} eq 'I' ? 'P' : 'C'; - $guarantorinfo=$guarantordata->{'surname'}." , ".$guarantordata->{'firstname'}; - $newdata{'contactfirstname'}= $guarantordata->{'firstname'}; - $newdata{'contactname'} = $guarantordata->{'surname'}; - $newdata{'contacttitle'} = $guarantordata->{'title'}; - if ( $op eq 'add' ) { - foreach (qw(streetnumber address streettype address2 - zipcode country city state phone phonepro mobile fax email emailpro branchcode - B_streetnumber B_streettype B_address B_address2 - B_city B_state B_zipcode B_country B_email B_phone)) { - $newdata{$_} = $guarantordata->{$_}; - } + + my @new_guarantors; + my @new_guarantor_id = $input->multi_param('new_guarantor_id'); + my @new_guarantor_relationship = $input->multi_param('new_guarantor_relationship'); + foreach my $gid ( @new_guarantor_id ) { + my $patron = Koha::Patrons->find( $gid ); + my $relationship = shift( @new_guarantor_relationship ); + next unless $patron; + my $g = { patron => $patron, relationship => $relationship }; + push( @new_guarantors, $g ); } + $template->param( new_guarantors => \@new_guarantors ); } } @@ -281,14 +278,14 @@ $newdata{'lang'} = $input->param('lang') if defined($input->param('lang')) if ( ( defined $newdata{'userid'} && $newdata{'userid'} eq '' ) || $check_BorrowerUnwantedField =~ /userid/ && !defined $data{'userid'} ) { my $fake_patron = Koha::Patron->new; $fake_patron->userid($patron->userid) if $patron; # editing - if ( ( defined $newdata{'firstname'} || $category_type eq 'I' ) && ( defined $newdata{'surname'} ) ) { + if ( ( defined $newdata{'firstname'} || $category->category_type eq 'I' ) && ( defined $newdata{'surname'} ) ) { # Full page edit, firstname and surname input zones are present $fake_patron->firstname($newdata{firstname}); $fake_patron->surname($newdata{surname}); $fake_patron->generate_userid; $newdata{'userid'} = $fake_patron->userid; } - elsif ( ( defined $data{'firstname'} || $category_type eq 'I' ) && ( defined $data{'surname'} ) ) { + elsif ( ( defined $data{'firstname'} || $category->category_type eq 'I' ) && ( defined $data{'surname'} ) ) { # Partial page edit (access through "Details"/"Library details" tab), firstname and surname input zones are not used # Still, if the userid field is erased, we can create a new userid with available firstname and surname # FIXME clean thiscode newdata vs data is very confusing @@ -301,9 +298,8 @@ if ( ( defined $newdata{'userid'} && $newdata{'userid'} eq '' ) || $check_Borrow $newdata{'userid'} = $data{'userid'}; } } - -$debug and warn join "\t", map {"$_: $newdata{$_}"} qw(dateofbirth dateenrolled dateexpiry); -my $extended_patron_attributes = (); + +my $extended_patron_attributes; if ($op eq 'save' || $op eq 'insert'){ output_and_exit( $input, $cookie, $template, 'wrong_csrf_token' ) @@ -315,7 +311,12 @@ if ($op eq 'save' || $op eq 'insert'){ # If the cardnumber is blank, treat it as null. $newdata{'cardnumber'} = undef if $newdata{'cardnumber'} =~ /^\s*$/; - if (my $error_code = checkcardnumber($newdata{cardnumber},$newdata{borrowernumber})){ + my $new_barcode = $newdata{'cardnumber'}; + Koha::Plugins->call( 'patron_barcode_transform', \$new_barcode ); + + $newdata{'cardnumber'} = $new_barcode; + + if (my $error_code = checkcardnumber( $newdata{cardnumber}, $borrowernumber )){ push @errors, $error_code == 1 ? 'ERROR_cardnumber_already_exists' : $error_code == 2 @@ -334,8 +335,7 @@ if ($op eq 'save' || $op eq 'insert'){ if ( $dateofbirth ) { my $patron = Koha::Patron->new({ dateofbirth => $dateofbirth }); my $age = $patron->get_age; - my $borrowercategory = Koha::Patron::Categories->find($categorycode); - my ($low,$high) = ($borrowercategory->dateofbirthrequired, $borrowercategory->upperagelimit); + my ($low,$high) = ($category->dateofbirthrequired, $category->upperagelimit); if (($high && ($age > $high)) or ($age < $low)) { push @errors, 'ERROR_age_limitations'; $template->param( age_low => $low); @@ -343,13 +343,8 @@ if ($op eq 'save' || $op eq 'insert'){ } } - if($newdata{surname} && C4::Context->preference('uppercasesurnames')) { - $newdata{'surname'} = uc($newdata{'surname'}); - } - if (C4::Context->preference("IndependentBranches")) { unless ( C4::Context->IsSuperLibrarian() ){ - $debug and print STDERR " $newdata{'branchcode'} : ".$userenv->{flags}.":".$userenv->{branch}; unless (!$newdata{'branchcode'} || $userenv->{branch} eq $newdata{'branchcode'}){ push @errors, "ERROR_branch"; } @@ -359,7 +354,7 @@ if ($op eq 'save' || $op eq 'insert'){ # the edited values list when editing certain sub-forms. Get it straight # from the DB if absent. my $userid = $newdata{ userid } // $borrower_data->{ userid }; - my $p = $borrowernumber ? Koha::Patrons->find( $borrowernumber ) : Koha::Patron->new; + my $p = $borrowernumber ? Koha::Patrons->find( $borrowernumber ) : Koha::Patron->new(); $p->userid( $userid ); unless ( $p->has_valid_userid ) { push @errors, "ERROR_login_exist"; @@ -370,7 +365,7 @@ if ($op eq 'save' || $op eq 'insert'){ push @errors, "ERROR_password_mismatch" if ( $password ne $password2 ); if ( $password and $password ne '****' ) { - my ( $is_valid, $error ) = Koha::AuthUtils::is_password_valid( $password ); + my ( $is_valid, $error ) = Koha::AuthUtils::is_password_valid( $password, $category ); unless ( $is_valid ) { push @errors, 'ERROR_password_too_short' if $error eq 'too_short'; push @errors, 'ERROR_password_too_weak' if $error eq 'too_weak'; @@ -384,35 +379,39 @@ if ($op eq 'save' || $op eq 'insert'){ my $emailalt = $input->param('B_email'); if ($emailprimary) { - push (@errors, "ERROR_bad_email") if (!Email::Valid->address($emailprimary)); + push (@errors, "ERROR_bad_email") unless Koha::Email->is_valid($emailprimary); } if ($emailsecondary) { - push (@errors, "ERROR_bad_email_secondary") if (!Email::Valid->address($emailsecondary)); + push (@errors, "ERROR_bad_email_secondary") unless Koha::Email->is_valid($emailsecondary); } if ($emailalt) { - push (@errors, "ERROR_bad_email_alternative") if (!Email::Valid->address($emailalt)); + push (@errors, "ERROR_bad_email_alternative") unless Koha::Email->is_valid($emailalt); } - if (C4::Context->preference('ExtendedPatronAttributes')) { - $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_code => $attr->{code}, - ERROR_extended_unique_id_failed_value => $attr->{value}, - ERROR_extended_unique_id_failed_description => $attr_info->description() - ); - } - } + if (C4::Context->preference('ExtendedPatronAttributes') and $input->param('setting_extended_patron_attributes')) { + $extended_patron_attributes = parse_extended_patron_attributes($input); + for my $attr ( @$extended_patron_attributes ) { + $attr->{borrowernumber} = $borrowernumber if $borrowernumber; + my $attribute = Koha::Patron::Attribute->new($attr); + if ( !$attribute->unique_ok ) { + push @errors, "ERROR_extended_unique_id_failed"; + my $attr_type = Koha::Patron::Attribute::Types->find($attr->{code}); + $template->param( + ERROR_extended_unique_id_failed_code => $attr->{code}, + ERROR_extended_unique_id_failed_value => $attr->{attribute}, + ERROR_extended_unique_id_failed_description => $attr_type->description() + ); + } + } } } +elsif ( $borrowernumber ) { + $extended_patron_attributes = Koha::Patrons->find($borrowernumber)->extended_attributes->unblessed; +} if ( ($op eq 'modify' || $op eq 'insert' || $op eq 'save'|| $op eq 'duplicate') and ($step == 0 or $step == 3 )){ unless ($newdata{'dateexpiry'}){ - my $patron_category = Koha::Patron::Categories->find( $newdata{categorycode} ); - $newdata{'dateexpiry'} = $patron_category->get_expiry_date( $newdata{dateenrolled} ) if $patron_category; + $newdata{'dateexpiry'} = $category->get_expiry_date( $newdata{dateenrolled} ) if $category; } } @@ -425,58 +424,61 @@ if ( defined $sms ) { ### Error checks should happen before this line. $nok = $nok || scalar(@errors); 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); + my $success; if ($op eq 'insert'){ # we know it's not a duplicate borrowernumber or there would already be an error delete $newdata{password2}; - my $patron = eval { Koha::Patron->new(\%newdata)->store }; + $patron = eval { Koha::Patron->new(\%newdata)->store }; if ( $@ ) { # FIXME Urgent error handling here, we cannot fail without relevant feedback # Lot of code will need to be removed from this script to handle exceptions raised by Koha::Patron->store warn "Patron creation failed! - $@"; # Maybe we must die instead of just warn + push @messages, {error => 'error_on_insert_patron'}; + $op = "add"; } else { + $success = 1; + add_guarantors( $patron, $input ); $borrowernumber = $patron->borrowernumber; $newdata{'borrowernumber'} = $borrowernumber; + delete $newdata{password}; } - # If 'AutoEmailOpacUser' syspref is on, email user their account details from the 'notice' that matches the user's branchcode. - if ( C4::Context->preference("AutoEmailOpacUser") == 1 && $newdata{'userid'} && $newdata{'password'}) { + # If 'AutoEmailNewUser' syspref is on, email user their account details from the 'notice' that matches the user's branchcode. + if ( C4::Context->preference("AutoEmailNewUser") ) { #look for defined primary email address, if blank - attempt to use borr.email and borr.emailpro instead - my $emailaddr; - if (C4::Context->preference("AutoEmailPrimaryAddress") ne 'OFF' && - $newdata{C4::Context->preference("AutoEmailPrimaryAddress")} =~ /\w\@\w/ ) { - $emailaddr = $newdata{C4::Context->preference("AutoEmailPrimaryAddress")} - } - elsif ($newdata{email} =~ /\w\@\w/) { - $emailaddr = $newdata{email} - } - elsif ($newdata{emailpro} =~ /\w\@\w/) { - $emailaddr = $newdata{emailpro} - } - elsif ($newdata{B_email} =~ /\w\@\w/) { - $emailaddr = $newdata{B_email} - } + my $emailaddr = $patron->notice_email_address; # if we manage to find a valid email address, send notice if ($emailaddr) { - $newdata{emailaddr} = $emailaddr; - my $err; eval { - $err = SendAlerts ( 'members', \%newdata, "ACCTDETAILS" ); + my $letter = GetPreparedLetter( + module => 'members', + letter_code => 'WELCOME', + branchcode => $patron->branchcode,, + lang => $patron->lang || 'default', + tables => { + 'branches' => $patron->branchcode, + 'borrowers' => $patron->borrowernumber, + }, + want_librarian => 1, + ) or return; + + my $message_id = EnqueueLetter( + { + letter => $letter, + borrowernumber => $patron->id, + to_address => $emailaddr, + message_transport_type => 'email' + } + ); + SendQueuedMessages({ message_id => $message_id }); }; - if ( $@ ) { - $template->param(error_alert => $@); - } elsif ( ref($err) eq "HASH" && defined $err->{error} and $err->{error} eq "no_email" ) { - $template->{VARS}->{'error_alert'} = "no_email"; - } else { - $template->{VARS}->{'info_alert'} = 1; + if ($@) { + $template->param( error_alert => $@ ); } } } - 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')) { + if ( $patron && (C4::Context->preference('EnhancedMessagingPreferences') and $input->param('setting_messaging_prefs')) ) { C4::Form::MessagingPreferences::handle_form_action($input, { borrowernumber => $borrowernumber }, $template, 1, $newdata{'categorycode'}); } @@ -486,7 +488,7 @@ if ((!$nok) and $nodouble and ($op eq 'insert' or $op eq 'save')){ $hsbnd_chooser = 1 if $input->param('housebound_chooser'); $hsbnd_deliverer = 1 if $input->param('housebound_deliverer'); # Only create a HouseboundRole if patron has a role. - if ( $hsbnd_chooser || $hsbnd_deliverer ) { + if ( $patron && ( $hsbnd_chooser || $hsbnd_deliverer ) ) { Koha::Patron::HouseboundRole->new({ borrowernumber_id => $borrowernumber, housebound_chooser => $hsbnd_chooser, @@ -496,71 +498,91 @@ if ((!$nok) and $nodouble and ($op eq 'insert' or $op eq 'save')){ } elsif ($op eq 'save') { - # Update or create our HouseboundRole if necessary. - my $housebound_role = Koha::Patron::HouseboundRoles->find($borrowernumber); - my ( $hsbnd_chooser, $hsbnd_deliverer ) = ( 0, 0 ); - $hsbnd_chooser = 1 if $input->param('housebound_chooser'); - $hsbnd_deliverer = 1 if $input->param('housebound_deliverer'); - if ( $housebound_role ) { - if ( $hsbnd_chooser || $hsbnd_deliverer ) { - # Update our HouseboundRole. - $housebound_role - ->housebound_chooser($hsbnd_chooser) - ->housebound_deliverer($hsbnd_deliverer) - ->store; - } else { - $housebound_role->delete; # No longer needed. - } - } else { - # Only create a HouseboundRole if patron has a role. - if ( $hsbnd_chooser || $hsbnd_deliverer ) { - $housebound_role = Koha::Patron::HouseboundRole->new({ - borrowernumber_id => $borrowernumber, - housebound_chooser => $hsbnd_chooser, - housebound_deliverer => $hsbnd_deliverer, - })->store; - } - } - if ($NoUpdateLogin) { delete $newdata{'password'}; delete $newdata{'userid'}; } - my $patron = Koha::Patrons->find( $borrowernumber ); - $newdata{debarredcomment} = $newdata{debarred_comment}; - delete $newdata{debarred_comment}; + $patron = Koha::Patrons->find( $borrowernumber ); + + if ($NoUpdateEmail) { + delete $newdata{'email'}; + delete $newdata{'emailpro'}; + delete $newdata{'B_email'}; + } + delete $newdata{password2}; - $patron->set(\%newdata)->store if 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 - - # should never raise an exception as password validity is checked above - my $password = $newdata{password}; - if ( $password and $password ne '****' ) { - $patron->set_password({ password => $password }); + + eval { + $patron->set(\%newdata)->store if 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 ( $@ ) { + warn "Patron modification failed! - $@"; # Maybe we must die instead of just warn + push @messages, {error => 'error_on_update_patron'}; + $op = "modify"; + } else { + + $success = 1; + # Update or create our HouseboundRole if necessary. + my $housebound_role = Koha::Patron::HouseboundRoles->find($borrowernumber); + my ( $hsbnd_chooser, $hsbnd_deliverer ) = ( 0, 0 ); + $hsbnd_chooser = 1 if $input->param('housebound_chooser'); + $hsbnd_deliverer = 1 if $input->param('housebound_deliverer'); + if ( $housebound_role ) { + if ( $hsbnd_chooser || $hsbnd_deliverer ) { + # Update our HouseboundRole. + $housebound_role + ->housebound_chooser($hsbnd_chooser) + ->housebound_deliverer($hsbnd_deliverer) + ->store; + } else { + $housebound_role->delete; # No longer needed. + } + } else { + # Only create a HouseboundRole if patron has a role. + if ( $hsbnd_chooser || $hsbnd_deliverer ) { + $housebound_role = Koha::Patron::HouseboundRole->new({ + borrowernumber_id => $borrowernumber, + housebound_chooser => $hsbnd_chooser, + housebound_deliverer => $hsbnd_deliverer, + })->store; + } + } + + # should never raise an exception as password validity is checked above + my $password = $newdata{password}; + if ( $password and $password ne '****' ) { + $patron->set_password({ password => $password }); + } + + add_guarantors( $patron, $input ); + if (C4::Context->preference('EnhancedMessagingPreferences') and $input->param('setting_messaging_prefs')) { + C4::Form::MessagingPreferences::handle_form_action($input, { borrowernumber => $borrowernumber }, $template); + } } + } + if ( $success ) { 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); + $patron->extended_attributes->filter_by_branch_limitations->delete; + $patron->extended_attributes($extended_patron_attributes); } - } - if ( $destination eq 'circ' and not C4::Auth::haspermission( C4::Context->userenv->{id}, { circulate => 'circulate_remaining_permissions' } ) ) { - # If we want to redirect to circulation.pl and need to check if the logged in user has the necessary permission - $destination = 'not_circ'; + if ( $destination eq 'circ' and not C4::Auth::haspermission( C4::Context->userenv->{id}, { circulate => 'circulate_remaining_permissions' } ) ) { + # If we want to redirect to circulation.pl and need to check if the logged in user has the necessary permission + $destination = 'not_circ'; + } + print scalar( $destination eq "circ" ) + ? $input->redirect( + "/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber") + : $input->redirect( + "/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber" + ); + exit; # You can only send 1 redirect! After that, content or other headers don't matter. } - print scalar( $destination eq "circ" ) - ? $input->redirect( - "/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber") - : $input->redirect( - "/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber" - ); - exit; # You can only send 1 redirect! After that, content or other headers don't matter. } if ($delete){ @@ -586,7 +608,17 @@ if (C4::Context->preference("IndependentBranches")) { } } } + +# Define the fields to be pre-filled in guarantee records +my $prefillguarantorfields=C4::Context->preference("PrefillGuaranteeField"); +my @prefill_fields=split(/\,/,$prefillguarantorfields); + if ($op eq 'add'){ + if ($guarantor_id) { + foreach (@prefill_fields) { + $newdata{$_} = $guarantor->$_; + } + } $template->param( updtype => 'I', step_1=>1, step_2=>1, step_3=>1, step_4=>1, step_5 => 1, step_6 => 1, step_7 => 1); } if ($op eq "modify") { @@ -608,48 +640,40 @@ if(!defined($data{'sex'})){ $template->param( female => 1); } elsif ($data{'sex'} eq 'M'){ $template->param( male => 1); +} elsif ($data{'sex'} eq 'O') { + $template->param( other => 1); } else { $template->param( none => 1); } ##Now all the data to modify a member. -my @typeloop; -my $no_categories = 1; -my $no_add; -foreach my $category_type (qw(C A S P I X)) { - my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => $category_type }, {order_by => ['categorycode']}); - $no_categories = 0 if $patron_categories->count > 0; - - my @categoryloop; - while ( my $patron_category = $patron_categories->next ) { - push @categoryloop, - { 'categorycode' => $patron_category->categorycode, - 'categoryname' => $patron_category->description, - 'categorycodeselected' => - ( defined($categorycode) && $patron_category->categorycode eq $categorycode ), - }; - } - my %typehash; - $typehash{'typename'} = $category_type; - my $typedescription = "typename_" . $typehash{'typename'}; - $typehash{'categoryloop'} = \@categoryloop; - push @typeloop, - { 'typename' => $category_type, - $typedescription => 1, - 'categoryloop' => \@categoryloop - }; +my $patron_categories = Koha::Patron::Categories->search_with_library_limits( + { + category_type => [qw(C A S P I X)], + ( $guarantor_id ? ( can_be_guarantee => 1 ) : () ) + }, + { order_by => ['categorycode'] } +); +my $no_categories = ! $patron_categories->count; +my $categories = {}; +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; } -$template->param('typeloop' => \@typeloop, - no_categories => $no_categories); -if($no_categories){ $no_add = 1; } - +$template->param( + patron_categories => $categories, + no_categories => $no_categories, +); my $cities = Koha::Cities->search( {}, { order_by => 'city_name' } ); -my $roadtypes = C4::Koha::GetAuthorisedValues( 'ROADTYPE' ); $template->param( - roadtypes => $roadtypes, cities => $cities, ); @@ -669,26 +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) @@ -698,11 +702,12 @@ if (C4::Context->userenv && C4::Context->userenv->{'branch'}) { $userbranch = C4::Context->userenv->{'branch'}; } -if (defined ($data{'branchcode'}) and ( $op eq 'modify' || $op eq 'duplicate' || ( $op eq 'add' && $category_type eq 'C' ) )) { +if (defined ($data{'branchcode'}) and ( $op eq 'modify' || $op eq 'duplicate' || ( $op eq 'add' && $category->category_type eq 'C' ) )) { $userbranch = $data{'branchcode'}; } $template->param( userbranch => $userbranch ); +my $no_add; if ( Koha::Libraries->search->count < 1 ){ $no_add = 1; $template->param(no_branches => 1); @@ -716,6 +721,7 @@ $template->param(no_add => $no_add); $template->param( sort1 => $data{'sort1'}); $template->param( sort2 => $data{'sort2'}); +$template->param( autorenew => $data{'autorenew'}); if ($nok) { foreach my $error (@errors) { @@ -727,27 +733,19 @@ if ($nok) { #Formatting data for display if (!defined($data{'dateenrolled'}) or $data{'dateenrolled'} eq ''){ - $data{'dateenrolled'} = output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }); + $data{'dateenrolled'} = dt_from_string; } if ( $op eq 'duplicate' ) { - $data{'dateenrolled'} = output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }); - my $patron_category = Koha::Patron::Categories->find( $data{categorycode} ); - $data{dateexpiry} = $patron_category->get_expiry_date( $data{dateenrolled} ); + $data{'dateenrolled'} = dt_from_string; + $data{dateexpiry} = $category->get_expiry_date( $data{dateenrolled} ); } if (C4::Context->preference('uppercasesurnames')) { $data{'surname'} &&= uc( $data{'surname'} ); $data{'contactname'} &&= uc( $data{'contactname'} ); } -foreach (qw(dateenrolled dateexpiry dateofbirth)) { - if ( $data{$_} ) { - $data{$_} = eval { output_pref({ dt => dt_from_string( $data{$_} ), dateonly => 1 } ); }; # back to syspref for display - } - $template->param( $_ => $data{$_}); -} - -if (C4::Context->preference('ExtendedPatronAttributes')) { - patron_attributes_form($template, $borrowernumber); +if ( C4::Context->preference('ExtendedPatronAttributes') ) { + patron_attributes_form( $template, $extended_patron_attributes, $op ); } if (C4::Context->preference('EnhancedMessagingPreferences')) { @@ -761,36 +759,28 @@ if (C4::Context->preference('EnhancedMessagingPreferences')) { $template->param(TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification")); } -$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( borrower_data => \%data ); +$template->param( "show_guarantor" => $category ? $category->can_be_guarantee : 1); # associate with step to know where you are $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( BorrowerMandatoryField => C4::Context->preference("BorrowerMandatoryField"),#field to test with javascript - category_type => $category_type,#to know the category type of the borrower - "$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 + destination => $destination,#to know where u come from and where u must go in redirect check_member => $check_member,#to know if the borrower already exist(=>1) or not (=>0) "op$op" => 1); -$guarantorid = $borrower_data->{'guarantorid'} || $guarantorid; -my $guarantor = $guarantorid ? Koha::Patrons->find( $guarantorid ) : undef; $template->param( patron => $patron ? $patron : \%newdata, # Used by address include templates now nodouble => $nodouble, borrowernumber => $borrowernumber, #register number - guarantor => $guarantor, - guarantorid => $guarantorid, relshiploop => \@relshipdata, btitle=> $default_borrowertitle, - guarantorinfo => $guarantorinfo, - flagloop => \@flagdata, - category_type =>$category_type, modify => $modify, nok => $nok,#flag to know if an error NoUpdateLogin => $NoUpdateLogin, + NoUpdateEmail => $NoUpdateEmail, + CanUpdatePasswordExpiration => $CanUpdatePasswordExpiration, ); # Generate CSRF token @@ -800,7 +790,7 @@ $template->param( csrf_token => # HouseboundModule data $template->param( - housebound_role => scalar Koha::Patron::HouseboundRoles->find($borrowernumber), + housebound_role => Koha::Patron::HouseboundRoles->find($borrowernumber), ); if(defined($data{'flags'})){ @@ -824,9 +814,10 @@ if ( C4::Context->preference('TranslateNotices') ) { $template->param( languages => $translated_languages ); } +$template->param( messages => \@messages ); output_html_with_http_headers $input, $cookie, $template->output; -sub parse_extended_patron_attributes { +sub parse_extended_patron_attributes { my ($input) = @_; my @patron_attr = grep { /^patron_attr_\d+$/ } $input->multi_param(); @@ -838,23 +829,22 @@ sub parse_extended_patron_attributes { my $code = $input->param("${key}_code"); next if exists $dups{$code}->{$value}; $dups{$code}->{$value} = 1; - push @attr, { code => $code, value => $value }; + push @attr, { code => $code, attribute => $value }; } return \@attr; } sub patron_attributes_form { my $template = shift; - my $borrowernumber = shift; + my $attributes = shift; + my $op = shift; - my @types = C4::Members::AttributeTypes::GetAttributeTypes(); - if (scalar(@types) == 0) { + my $library_id = C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef; + my $attribute_types = Koha::Patron::Attribute::Types->search_with_library_limits({}, {}, $library_id); + if ( $attribute_types->count == 0 ) { $template->param(no_patron_attribute_types => 1); return; } - my $attributes = C4::Members::Attributes::GetBorrowerAttributes($borrowernumber); - my @classes = uniq( map {$_->{class}} @$attributes ); - @classes = sort @classes; # map patron's attributes into a more convenient structure my %attr_hash = (); @@ -865,8 +855,7 @@ sub patron_attributes_form { my @attribute_loop = (); my $i = 0; my %items_by_class; - foreach my $type_code (map { $_->{code} } @types) { - my $attr_type = C4::Members::AttributeTypes->fetch($type_code); + while ( my ( $attr_type ) = $attribute_types->next ) { my $entry = { class => $attr_type->class(), code => $attr_type->code(), @@ -874,17 +863,19 @@ sub patron_attributes_form { repeatable => $attr_type->repeatable(), category => $attr_type->authorised_value_category(), category_code => $attr_type->category_code(), + mandatory => $attr_type->mandatory(), }; if (exists $attr_hash{$attr_type->code()}) { foreach my $attr (@{ $attr_hash{$attr_type->code()} }) { my $newentry = { %$entry }; - $newentry->{value} = $attr->{value}; + $newentry->{value} = $attr->{attribute}; $newentry->{use_dropdown} = 0; if ($attr_type->authorised_value_category()) { $newentry->{use_dropdown} = 1; - $newentry->{auth_val_loop} = GetAuthorisedValues($attr_type->authorised_value_category(), $attr->{value}); + $newentry->{auth_val_loop} = GetAuthorisedValues($attr_type->authorised_value_category(), $attr->{attribute}); } $i++; + undef $newentry->{value} if ($attr_type->unique_id() && $op eq 'duplicate'); $newentry->{form_id} = "patron_attr_$i"; push @{$items_by_class{$attr_type->class()}}, $newentry; } @@ -899,12 +890,12 @@ sub patron_attributes_form { push @{$items_by_class{$attr_type->class()}}, $newentry; } } - while ( my ($class, @items) = each %items_by_class ) { + for my $class ( sort keys %items_by_class ) { my $av = Koha::AuthorisedValues->search({ category => 'PA_CLASS', authorised_value => $class }); my $lib = $av->count ? $av->next->lib : $class; push @attribute_loop, { class => $class, - items => @items, + items => $items_by_class{$class}, lib => $lib, } } @@ -913,6 +904,27 @@ sub patron_attributes_form { } +sub add_guarantors { + my ( $patron, $input ) = @_; + + my @new_guarantor_id = $input->multi_param('new_guarantor_id'); + my @new_guarantor_relationship = $input->multi_param('new_guarantor_relationship'); + + for ( my $i = 0 ; $i < scalar @new_guarantor_id; $i++ ) { + my $guarantor_id = $new_guarantor_id[$i]; + my $relationship = $new_guarantor_relationship[$i]; + + next unless $guarantor_id; + + $patron->add_guarantor( + { + guarantor_id => $guarantor_id, + relationship => $relationship, + } + ); + } +} + # Local Variables: # tab-width: 8 # End: