use C4::Form::MessagingPreferences;
use Koha::Borrower::Debarments;
use Koha::DateUtils;
+use Module::Load;
+if ( C4::Context->preference('NorwegianPatronDBEnable') && C4::Context->preference('NorwegianPatronDBEnable') == 1 ) {
+ load Koha::NorwegianPatronDB, qw( NLGetSyncDataFromBorrowernumber );
+}
use vars qw($debug);
my $dbh = C4::Context->dbh;
my ($template, $loggedinuser, $cookie)
- = get_template_and_user({template_name => "members/memberentrygen.tmpl",
+ = get_template_and_user({template_name => "members/memberentrygen.tt",
query => $input,
type => "intranet",
authnotrequired => 0,
if ( $input->param('add_debarment') ) {
my $expiration = $input->param('debarred_expiration');
- $expiration = $expiration ? output_pref( dt_from_string($expiration), 'iso' ) : undef;
+ $expiration =
+ $expiration
+ ? output_pref(
+ { 'dt' => dt_from_string($expiration), 'dateformat' => 'iso' } )
+ : undef;
- AddUniqueDebarment(
+ AddDebarment(
{
borrowernumber => $borrowernumber,
type => 'MANUAL',
qr/^nodouble$/,
qr/^op$/,
qr/^save$/,
- qr/^select_roadtype$/,
qr/^updtype$/,
qr/^SMSnumber$/,
qr/^setting_extended_patron_attributes$/,
# If the cardnumber is blank, treat it as null.
$newdata{'cardnumber'} = undef if $newdata{'cardnumber'} =~ /^\s*$/;
- if (checkcardnumber($newdata{cardnumber},$newdata{borrowernumber})){
- push @errors, 'ERROR_cardnumber';
- }
+ if (my $error_code = checkcardnumber($newdata{cardnumber},$newdata{borrowernumber})){
+ push @errors, $error_code == 1
+ ? 'ERROR_cardnumber_already_exists'
+ : $error_code == 2
+ ? 'ERROR_cardnumber_length'
+ : ()
+ }
+
if ($newdata{dateofbirth} && $dateofbirthmandatory) {
my $age = GetAge($newdata{dateofbirth});
my $borrowercategory=GetBorrowercategory($newdata{'categorycode'});
}
if (C4::Context->preference("IndependentBranches")) {
- if ($userenv && $userenv->{flags} % 2 != 1){
+ 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";
$extended_patron_attributes = parse_extended_patron_attributes($input);
foreach my $attr (@$extended_patron_attributes) {
unless (C4::Members::Attributes::CheckUniqueness($attr->{code}, $attr->{value}, $borrowernumber)) {
+ my $attr_info = C4::Members::AttributeTypes->fetch($attr->{code});
push @errors, "ERROR_extended_unique_id_failed";
- $template->param(ERROR_extended_unique_id_failed_value => "$attr->{code}/$attr->{value}");
+ $template->param(
+ ERROR_extended_unique_id_failed_code => $attr->{code},
+ ERROR_extended_unique_id_failed_value => $attr->{value},
+ ERROR_extended_unique_id_failed_description => $attr_info->description()
+ );
}
}
}
}
}
-if ( ( defined $input->param('SMSnumber') ) && ( $input->param('SMSnumber') ne $newdata{'mobile'} ) ) {
+if (
+ defined $input->param('SMSnumber')
+ && (
+ $input->param('SMSnumber') eq ""
+ or $input->param('SMSnumber') ne $newdata{'mobile'}
+ )
+) {
$newdata{smsalertnumber} = $input->param('SMSnumber');
}
}
}
- if ($data{'organisations'}){
- # need to add the members organisations
- my @orgs=split(/\|/,$data{'organisations'});
- add_member_orgs($borrowernumber,\@orgs);
- }
if (C4::Context->preference('ExtendedPatronAttributes') and $input->param('setting_extended_patron_attributes')) {
C4::Members::Attributes::SetBorrowerAttributes($borrowernumber, $extended_patron_attributes);
}
if (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 });
+ }
} elsif ($op eq 'save'){
if ($NoUpdateLogin) {
delete $newdata{'password'};
delete $newdata{'userid'};
}
- &ModMember(%newdata) unless scalar(keys %newdata) <= 1; # bug 4508 - avoid crash if we're not
+ &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("IndependentBranches")) {
my $userenv = C4::Context->userenv;
- if ($userenv->{flags} % 2 != 1 && $data{'branchcode'}){
+ if ( !C4::Context->IsSuperLibrarian() && $data{'branchcode'} ) {
unless ($userenv->{branch} eq $data{'branchcode'}){
print $input->redirect("/cgi-bin/koha/members/members-home.pl");
exit;
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' );
}
}
-my $default_roadtype;
-$default_roadtype=$data{'streettype'} ;
-my($roadtypeid,$road_type)=GetRoadTypes();
- $template->param( road_cgipopup => 1) if ($roadtypeid );
-my $roadpopup = CGI::popup_menu(-name=>'streettype',
- -id => 'streettype',
- -values=>$roadtypeid,
- -labels=>$road_type,
- -override => 1,
- -default=>$default_roadtype
- );
+my $roadtypes = C4::Koha::GetAuthorisedValues( 'ROADTYPE', $data{streettype} );
+$template->param( roadtypes => $roadtypes);
my $default_borrowertitle = '';
unless ( $op eq 'duplicate' ) { $default_borrowertitle=$data{'title'} }
$userbranch = C4::Context->userenv->{'branch'};
}
-if (defined ($data{'branchcode'}) and ( $op eq 'modify' || ( $op eq 'add' && $category_type eq 'C' ) )) {
+if (defined ($data{'branchcode'}) and ( $op eq 'modify' || $op eq 'duplicate' || ( $op eq 'add' && $category_type eq 'C' ) )) {
$userbranch = $data{'branchcode'};
}
$template->param(no_categories => 1);
}
$template->param(no_add => $no_add);
-my $CGIorganisations;
-my $member_of_institution;
-if (C4::Context->preference("memberofinstitution")){
- my $organisations=get_institutions();
- my @orgs;
- my %org_labels;
- foreach my $organisation (keys %$organisations) {
- push @orgs,$organisation;
- $org_labels{$organisation}=$organisations->{$organisation}->{'surname'};
- }
- $member_of_institution=1;
-
- $CGIorganisations = CGI::scrolling_list( -id => 'organisations',
- -name => 'organisations',
- -labels => \%org_labels,
- -values => \@orgs,
- -size => 5,
- -multiple => 'true'
-
- );
-}
-
# --------------------------------------------------------------------------------------------------------
-my $CGIsort = buildCGIsort("Bsort1","sort1",$data{'sort1'});
-if ($CGIsort) {
- $template->param(CGIsort1 => $CGIsort);
-}
-$template->param( sort1 => $data{'sort1'}); # shouldn't this be in an "else" statement like the 2nd one?
-
-$CGIsort = buildCGIsort("Bsort2","sort2",$data{'sort2'});
-if ($CGIsort) {
- $template->param(CGIsort2 => $CGIsort);
-} else {
- $template->param( sort2 => $data{'sort2'});
-}
+$template->param( sort1 => $data{'sort1'});
+$template->param( sort2 => $data{'sort2'});
if ($nok) {
foreach my $error (@errors) {
ethcatpopup => $ethcatpopup,
relshiploop => \@relshipdata,
city_loop => $city_arrayref,
- roadpopup => $roadpopup,
borrotitlepopup => $borrotitlepopup,
guarantorinfo => $guarantorinfo,
flagloop => \@flagdata,
category_type =>$category_type,
modify => $modify,
nok => $nok,#flag to konw if an error
- memberofinstution => $member_of_institution,
- CGIorganisations => $CGIorganisations,
NoUpdateLogin => $NoUpdateLogin
);
$template->param("contacttitle_" . $data{'contacttitle'} => "SELECTED");
}
-
+
+my ( $min, $max ) = C4::Members::get_cardnumber_length();
+if ( defined $min ) {
+ $template->param(
+ minlength_cardnumber => $min,
+ maxlength_cardnumber => $max
+ );
+}
+
output_html_with_http_headers $input, $cookie, $template->output;
sub parse_extended_patron_attributes {
};
if (exists $attr_hash{$attr_type->code()}) {
foreach my $attr (@{ $attr_hash{$attr_type->code()} }) {
- my $newentry = { map { $_ => $entry->{$_} } %$entry };
+ my $newentry = { %$entry };
$newentry->{value} = $attr->{value};
$newentry->{password} = $attr->{password};
$newentry->{use_dropdown} = 0;
}
} else {
$i++;
- my $newentry = { map { $_ => $entry->{$_} } %$entry };
+ my $newentry = { %$entry };
if ($attr_type->authorised_value_category()) {
$newentry->{use_dropdown} = 1;
$newentry->{auth_val_loop} = GetAuthorisedValues($attr_type->authorised_value_category());
projects / srvgit / blobdiff