# along with Koha; if not, see <http://www.gnu.org/licenses>.
# pragma
-use strict;
-use warnings;
+use Modern::Perl;
# external modules
use CGI qw ( -utf8 );
-use List::MoreUtils qw/uniq/;
-use Digest::MD5 qw(md5_base64);
# 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( SendAlerts );
use C4::Form::MessagingPreferences;
+use Koha::AuthUtils;
use Koha::AuthorisedValues;
-use Koha::Patron::Debarments;
+use Koha::Patron::Debarments qw( AddDebarment DelDebarment GetDebarments );
use Koha::Cities;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string output_pref );
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::Token;
use Email::Valid;
-use Module::Load;
-if ( C4::Context->preference('NorwegianPatronDBEnable') && C4::Context->preference('NorwegianPatronDBEnable') == 1 ) {
- load Koha::NorwegianPatronDB, qw( NLGetSyncDataFromBorrowernumber );
-}
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;
= get_template_and_user({template_name => "members/memberentrygen.tt",
query => $input,
type => "intranet",
- authnotrequired => 0,
- flagsrequired => {borrowers => 1},
- debug => ($debug) ? 1 : 0,
+ flagsrequired => {borrowers => 'edit_borrowers'},
});
+my $borrowernumber = $input->param('borrowernumber');
+my $patron = Koha::Patrons->find($borrowernumber);
+
+if ( $borrowernumber and not $patron ) {
+ output_and_exit( $input, $cookie, $template, 'unknown_patron' );
+}
+
if ( C4::Context->preference('SMSSendDriver') eq 'Email' ) {
my @providers = Koha::SMS::Providers->search();
$template->param( sms_providers => \@providers );
}
-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');
# 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 $userenv = C4::Context->userenv;
+my @messages;
+
+## Deal with guarantor stuff
+$template->param( relationships => scalar $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 => GetDebarments( { borrowernumber => $borrowernumber } ) );
+ debarments => scalar GetDebarments( { borrowernumber => $borrowernumber } ) );
my @debarments_to_remove = $input->multi_param('remove_debarment');
foreach my $d ( @debarments_to_remove ) {
DelDebarment( $d );
my $expiration = $input->param('debarred_expiration');
$expiration =
$expiration
- ? output_pref(
- { 'dt' => dt_from_string($expiration), 'dateformat' => 'iso' } )
+ ? dt_from_string($expiration)->ymd
: undef;
AddDebarment(
$template->param("uppercasesurnames" => C4::Context->preference('uppercasesurnames'));
-my $minpw = C4::Context->preference('minPasswordLength');
-$template->param("minPasswordLength" => $minpw);
-
# function to designate mandatory fields (visually with css)
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 );
-( $borrower_data = GetMember( 'borrowernumber' => $borrowernumber ) ) if ( $op eq 'modify' or $op eq 'save' or $op eq 'duplicate' );
+if ( $op eq 'modify' or $op eq 'save' or $op eq 'duplicate' ) {
+ 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;
+ }
+
+ $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)){
foreach my $key (@names) {
if (defined $input->param($key)) {
$newdata{$key} = $input->param($key);
- $newdata{$key} =~ s/\"/"/g unless $key eq 'borrowernotes' or $key eq 'opacnote';
}
}
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.
+
+ # check permission to modify login info.
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
+# remove keys from %newdata that is not part of patron's attributes
{
my @keys_to_delete = (
qr/^BorrowerMandatoryField$/,
qr/^\d+$/,
qr/^\d+-DAYS/,
qr/^patron_attr_/,
+ qr/^csrf_token$/,
+ qr/^add_debarment$/, qr/^debarred_comment$/,qr/^debarred_expiration$/, 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$/,
);
for my $regexp (@keys_to_delete) {
for (keys %newdata) {
# 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);
+ 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 $guarantordata=GetMember(borrowernumber => $guarantorid)) {
- $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 );
}
}
$newdata{'zipcode'} = $input->param('zipcode') if defined($input->param('zipcode'));
$newdata{'country'} = $input->param('country') if defined($input->param('country'));
+$newdata{'lang'} = $input->param('lang') if defined($input->param('lang'));
+
# builds default userid
# userid input text may be empty or missing because of syspref BorrowerUnwantedField
-if ( ( defined $newdata{'userid'} && $newdata{'userid'} eq '' ) || $check_BorrowerUnwantedField =~ /userid/ ) {
- if ( ( defined $newdata{'firstname'} ) && ( defined $newdata{'surname'} ) ) {
+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'} ) ) {
# Full page edit, firstname and surname input zones are present
- $newdata{'userid'} = Generate_Userid( $borrowernumber, $newdata{'firstname'}, $newdata{'surname'} );
+ $fake_patron->firstname($newdata{firstname});
+ $fake_patron->surname($newdata{surname});
+ $fake_patron->generate_userid;
+ $newdata{'userid'} = $fake_patron->userid;
}
- elsif ( ( defined $data{'firstname'} ) && ( defined $data{'surname'} ) ) {
+ elsif ( ( defined $data{'firstname'} || $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
- $newdata{'userid'} = Generate_Userid( $borrowernumber, $data{'firstname'}, $data{'surname'} );
+ # FIXME clean thiscode newdata vs data is very confusing
+ $fake_patron->firstname($data{firstname});
+ $fake_patron->surname($data{surname});
+ $fake_patron->generate_userid;
+ $newdata{'userid'} = $fake_patron->userid;
}
else {
$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'){
- die "Wrong CSRF token"
+ output_and_exit( $input, $cookie, $template, 'wrong_csrf_token' )
unless Koha::Token->new->check_csrf({
- id => C4::Context->userenv->{id},
- secret => md5_base64( C4::Context->config('pass') ),
+ session_id => scalar $input->cookie('CGISESSID'),
token => scalar $input->param('csrf_token'),
});
: ()
}
- if ( $newdata{dateofbirth} ) {
- my $age = GetAge($newdata{dateofbirth});
+ my $dateofbirth;
+ if ($op eq 'save' && $step == 3) {
+ $dateofbirth = $patron->dateofbirth;
+ }
+ else {
+ $dateofbirth = $newdata{dateofbirth};
+ }
+
+ 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);
if (($high && ($age > $high)) or ($age < $low)) {
}
}
- 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";
}
# the edited values list when editing certain sub-forms. Get it straight
# from the DB if absent.
my $userid = $newdata{ userid } // $borrower_data->{ userid };
- unless (Check_Userid($userid,$borrowernumber)) {
+ my $p = $borrowernumber ? Koha::Patrons->find( $borrowernumber ) : Koha::Patron->new();
+ $p->userid( $userid );
+ unless ( $p->has_valid_userid ) {
push @errors, "ERROR_login_exist";
}
-
+
my $password = $input->param('password');
my $password2 = $input->param('password2');
push @errors, "ERROR_password_mismatch" if ( $password ne $password2 );
- push @errors, "ERROR_short_password" if( $password && $minpw && $password ne '****' && (length($password) < $minpw) );
+
+ if ( $password and $password ne '****' ) {
+ my ( $is_valid, $error ) = Koha::AuthUtils::is_password_valid( $password, Koha::Patron::Categories->find($categorycode) );
+ 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';
+ push @errors, 'ERROR_password_has_whitespaces' if $error eq 'has_whitespaces';
+ }
+ }
# Validate emails
my $emailprimary = $input->param('email');
push (@errors, "ERROR_bad_email_alternative") if (!Email::Valid->address($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'}){
### 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
- $borrowernumber = &AddMember(%newdata);
- $newdata{'borrowernumber'} = $borrowernumber;
+ delete $newdata{password2};
+ $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;
+ }
# 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 (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'});
}
- # Try to do the live sync with the Norwegian national patron database, if it is enabled
- if ( exists $data{'borrowernumber'} && C4::Context->preference('NorwegianPatronDBEnable') && C4::Context->preference('NorwegianPatronDBEnable') == 1 ) {
- NLSync({ 'borrowernumber' => $borrowernumber });
- }
# Create HouseboundRole if necessary.
# Borrower did not exist, so HouseboundRole *cannot* yet exist.
$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,
} 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;
+ if ($NoUpdateLogin) {
+ delete $newdata{'password'};
+ delete $newdata{'userid'};
+ }
+
+ $patron = Koha::Patrons->find( $borrowernumber );
+
+ if ($NoUpdateEmail) {
+ delete $newdata{'email'};
+ delete $newdata{'emailpro'};
+ delete $newdata{'B_email'};
+ }
+
+ delete $newdata{password2};
+
+ 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 {
- $housebound_role->delete; # No longer needed.
+ # 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;
+ }
}
- } 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 });
}
- }
- if ($NoUpdateLogin) {
- delete $newdata{'password'};
- delete $newdata{'userid'};
+ 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);
+ }
}
- &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 ( $success ) {
if (C4::Context->preference('ExtendedPatronAttributes') and $input->param('setting_extended_patron_attributes')) {
- C4::Members::Attributes::SetBorrowerAttributes($borrowernumber, $extended_patron_attributes);
+ $patron->extended_attributes->filter_by_branch_limitations->delete;
+ $patron->extended_attributes($extended_patron_attributes);
}
- if (C4::Context->preference('EnhancedMessagingPreferences') and $input->param('setting_messaging_prefs')) {
- C4::Form::MessagingPreferences::handle_form_action($input, { borrowernumber => $borrowernumber }, $template);
+
+ 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){
%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);
+ $template->param( step_1 => 1,step_2 => 1,step_3 => 1, step_4 => 1, step_5 => 1, step_6 => 1, step_7 => 1 );
}
}
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'){
- $template->param( updtype => 'I', step_1=>1, step_2=>1, step_3=>1, step_4=>1, step_5 => 1, step_6 => 1);
+ 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") {
$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;
+ $template->param( step_1=>1, step_2=>1, step_3=>1, step_4=>1, step_5 => 1, step_6 => 1, step_7 => 1) unless $step;
if ( $step == 4 ) {
$template->param( categorycode => $borrower_data->{'categorycode'} );
}
- # Add sync data to the user data
- if ( C4::Context->preference('NorwegianPatronDBEnable') && C4::Context->preference('NorwegianPatronDBEnable') == 1 ) {
- my $sync = NLGetSyncDataFromBorrowernumber( $borrowernumber );
- if ( $sync ) {
- $template->param(
- sync => $sync->sync,
- );
- }
- }
}
if ( $op eq "duplicate" ) {
$template->param( updtype => 'I' );
- $template->param( step_1 => 1, step_2 => 1, step_3 => 1, step_4 => 1, step_5 => 1, step_6 => 1 ) unless $step;
+ $template->param( step_1 => 1, step_2 => 1, step_3 => 1, step_4 => 1, step_5 => 1, step_6 => 1, step_7 => 1 ) unless $step;
$data{'cardnumber'} = "";
}
-$data{'cardnumber'}=fixup_cardnumber($data{'cardnumber'}) if ( ( $op eq 'add' ) or ( $op eq 'duplicate' ) );
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);
+} elsif ($data{'sex'} eq 'O') {
+ $template->param( other => 1);
} else {
$template->param( none => 1);
}
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']});
+ my $patron_categories = Koha::Patron::Categories->search_with_library_limits({ category_type => $category_type }, {order_by => ['categorycode']});
$no_categories = 0 if $patron_categories->count > 0;
my @categoryloop;
push @categoryloop,
{ 'categorycode' => $patron_category->categorycode,
'categoryname' => $patron_category->description,
+ 'effective_min_password_length' => $patron_category->effective_min_password_length,
+ 'effective_require_strong_password' => $patron_category->effective_require_strong_password,
'categorycodeselected' =>
- ( ( defined( $borrower_data->{'categorycode'} ) && $patron_category->categorycode eq $borrower_data->{'categorycode'} ) || ( defined($categorycode) && $patron_category->categorycode eq $categorycode ) ),
+ ( defined($categorycode) && $patron_category->categorycode eq $categorycode ),
};
}
my %typehash;
'categoryloop' => \@categoryloop
};
}
-
-$template->param('typeloop' => \@typeloop,
- no_categories => $no_categories);
-if($no_categories){ $no_add = 1; }
-
+$template->param(
+ typeloop => \@typeloop,
+ 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,
);
push(@relshipdata, \%row);
}
-my %flags = ( 'gonenoaddress' => ['gonenoaddress' ],
- 'lost' => ['lost']);
+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'}='';
+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';
}
- else {
- $row{'yes'}='';
- $row{'no'}=' checked';
- }
- push @flagdata,\%row;
+ push @flagdata, \%row;
}
# get Branch Loop
$template->param( sort1 => $data{'sort1'});
$template->param( sort2 => $data{'sort2'});
+$template->param( autorenew => $data{'autorenew'});
if ($nok) {
foreach my $error (@errors) {
$template->param( $_ => $data{$_});
}
-if (C4::Context->preference('ExtendedPatronAttributes')) {
- $template->param(ExtendedPatronAttributes => 1);
- patron_attributes_form($template, $borrowernumber);
+if ( C4::Context->preference('ExtendedPatronAttributes') ) {
+ patron_attributes_form( $template, $extended_patron_attributes, $op );
}
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( "show_guarantor" => ( $category_type =~ /A|I|S|X/ ) ? 0 : 1 ); # associate with step to know where you are
$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
"op$op" => 1);
$template->param(
+ patron => $patron ? $patron : \%newdata, # Used by address include templates now
nodouble => $nodouble,
borrowernumber => $borrowernumber, #register number
- guarantorid => ($borrower_data->{'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,
);
# Generate CSRF token
-$template->param(
- csrf_token => Koha::Token->new->generate_csrf(
- { id => C4::Context->userenv->{id},
- secret => md5_base64( C4::Context->config('pass') ),
- }
- ),
+$template->param( csrf_token =>
+ Koha::Token->new->generate_csrf( { session_id => scalar $input->cookie('CGISESSID'), } ),
);
# HouseboundModule data
);
}
+if ( C4::Context->preference('TranslateNotices') ) {
+ my $translated_languages = C4::Languages::getTranslatedLanguages( 'opac', C4::Context->preference('template') );
+ $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();
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 = ();
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(),
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;
}
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,
}
}
}
+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: