use C4::Members::Attributes;
use C4::Members::AttributeTypes;
use C4::Koha;
-use C4::Dates qw/format_date format_date_in_iso/;
-use C4::Input;
use C4::Log;
use C4::Letters;
use C4::Branch; # GetBranches
use C4::Form::MessagingPreferences;
-use Koha::Borrower::Debarments;
+use Koha::Patron::Debarments;
+use Koha::Cities;
use Koha::DateUtils;
+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);
debug => ($debug) ? 1 : 0,
});
+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') || '';
# 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
-my $check_categorytype=$input->param('check_categorytype');
-# NOTE: Alert for ethnicity and ethnotes fields, they are invalid in all borrowers form
my $borrower_data;
my $NoUpdateLogin;
my $userenv = C4::Context->userenv;
( $borrower_data = GetMember( 'borrowernumber' => $borrowernumber ) ) if ( $op eq 'modify' or $op eq 'save' or $op eq 'duplicate' );
my $categorycode = $input->param('categorycode') || $borrower_data->{'categorycode'};
my $category_type = $input->param('category_type') || '';
-if ($category_type){
- $template->{VARS}->{'type_only'} = 1;
-}
-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);
- }
+}
$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.
}
}
- 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";
+
+ 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 ); # else ERROR!
+ $template->param( "ERROR_$_" => 1 );
push(@errors,"ERROR_$_");
}
}
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'};
- }
}
#recover all data from guarantor address phone ,fax...
-if ( $guarantorid and ( $category_type eq 'C' || $category_type eq 'P' )) {
+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{'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 '')){
+# 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'} ) ) {
# Full page edit, firstname and surname input zones are present
$newdata{'userid'} = Generate_Userid( $borrowernumber, $newdata{'firstname'}, $newdata{'surname'} );
push @errors, "ERROR_password_mismatch" if ( $password ne $password2 );
push @errors, "ERROR_short_password" if( $password && $minpw && $password ne '****' && (length($password) < $minpw) );
+ # Validate emails
+ my $emailprimary = $input->param('email');
+ my $emailsecondary = $input->param('emailpro');
+ my $emailalt = $input->param('B_email');
+
+ if ($emailprimary) {
+ push (@errors, "ERROR_bad_email") if (!Email::Valid->address($emailprimary));
+ }
+ if ($emailsecondary) {
+ push (@errors, "ERROR_bad_email_secondary") if (!Email::Valid->address($emailsecondary));
+ }
+ if ($emailalt) {
+ 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) {
if ( ($op eq 'modify' || $op eq 'insert' || $op eq 'save'|| $op eq 'duplicate') and ($step == 0 or $step == 3 )){
unless ($newdata{'dateexpiry'}){
- my $arg2 = $newdata{'dateenrolled'} || C4::Dates->today('iso');
+ my $arg2 = $newdata{'dateenrolled'} || output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 });
$newdata{'dateexpiry'} = GetExpiryDate($newdata{'categorycode'},$arg2);
}
}
-if (
- defined $input->param('SMSnumber')
- && (
- $input->param('SMSnumber') eq ""
- or $input->param('SMSnumber') ne $newdata{'mobile'}
- )
-) {
- $newdata{smsalertnumber} = $input->param('SMSnumber');
+# BZ 14683: Do not mixup mobile [read: other phone] with smsalertnumber
+my $sms = $input->param('SMSnumber');
+if ( defined $sms ) {
+ $newdata{smsalertnumber} = $sms;
}
### Error checks should happen before this line.
}
##Now all the data to modify a member.
-my ($categories,$labels)=ethnicitycategories();
-
-my $ethnicitycategoriescount=$#{$categories};
-my $ethcatpopup;
-if ($ethnicitycategoriescount>=0) {
- $ethcatpopup = CGI::popup_menu(-name=>'ethnicity',
- -id => 'ethnicity',
- -tabindex=>'',
- -values=>$categories,
- -default=>$data{'ethnicity'},
- -labels=>$labels);
- $template->param(ethcatpopup => $ethcatpopup); # bad style, has to be fixed
-}
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);
+ my ($categories,$labels)=GetborCatFromCatType($_,$action);
if(scalar(@$categories) > 0){ $no_categories = 0; }
my @categoryloop;
foreach my $cat (@$categories){
$template->param('typeloop' => \@typeloop,
no_categories => $no_categories);
if($no_categories){ $no_add = 1; }
-# test in city
-if ( $guarantorid ) {
- $select_city = getidcity($data{city});
-}
-($default_city=$select_city) if ($step eq 0);
-if (!defined($select_city) or $select_city eq '' ){
- $default_city = &getidcity($data{'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 $cities = Koha::Cities->search( {}, { order_by => 'city_name' } );
my $roadtypes = C4::Koha::GetAuthorisedValues( 'ROADTYPE', $data{streettype} );
-$template->param( roadtypes => $roadtypes);
+$template->param(
+ roadtypes => $roadtypes,
+ cities => $cities,
+);
my $default_borrowertitle = '';
unless ( $op eq 'duplicate' ) { $default_borrowertitle=$data{'title'} }
#Formatting data for display
if (!defined($data{'dateenrolled'}) or $data{'dateenrolled'} eq ''){
- $data{'dateenrolled'}=C4::Dates->today('iso');
+ $data{'dateenrolled'} = output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 });
}
if ( $op eq 'duplicate' ) {
- $data{'dateenrolled'} = C4::Dates->today('iso');
+ $data{'dateenrolled'} = output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 });
$data{'dateexpiry'} = GetExpiryDate( $data{'categorycode'}, $data{'dateenrolled'} );
}
if (C4::Context->preference('uppercasesurnames')) {
}
foreach (qw(dateenrolled dateexpiry dateofbirth)) {
- $data{$_} = format_date($data{$_}); # back to syspref for display
- $template->param( $_ => $data{$_});
+ 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')) {
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(SMSnumber => $data{'smsalertnumber'} );
$template->param(TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification"));
}
$template->param(
BorrowerMandatoryField => C4::Context->preference("BorrowerMandatoryField"),#field to test with javascript
category_type => $category_type,#to know the category type of the borrower
- select_city => $select_city,
"$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)
nodouble => $nodouble,
borrowernumber => $borrowernumber, #register number
guarantorid => ($borrower_data->{'guarantorid'} || $guarantorid),
- ethcatpopup => $ethcatpopup,
relshiploop => \@relshipdata,
- city_loop => $city_arrayref,
borrotitlepopup => $borrotitlepopup,
guarantorinfo => $guarantorinfo,
flagloop => \@flagdata,
- 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
+ nok => $nok,#flag to know if an error
NoUpdateLogin => $NoUpdateLogin
);
projects / koha.git / blobdiff