# external modules
use Date::Calc qw/Today/;
use CGI;
-use Digest::MD5 qw(md5_base64);
+# use Digest::MD5 qw(md5_base64);
# internal modules
use C4::Auth;
}
my $input = new CGI;
+($debug) or $debug = $input->param('debug') || 0;
my %data;
my $dbh = C4::Context->dbh;
type => "intranet",
authnotrequired => 0,
flagsrequired => {borrowers => 1},
- debug => 1,
+ debug => ($debug) ? 1 : 0,
});
my $guarantorid=$input->param('guarantorid');
my $borrowernumber=$input->param('borrowernumber');
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 unvalided in all borrowers form
+# NOTE: Alert for ethnicity and ethnotes fields, they are invalid in all borrowers form
my $borrower_data;
my $NoUpdateLogin;
my $userenv = C4::Context->userenv;
$template->param("uppercasesurnames" => C4::Context->preference('uppercasesurnames'));
-#function to automatic setup the mandatory fields (visual with css)
+# 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);
}
$template->param("add"=>1) if ($op eq 'add');
$template->param("checked" => 1) if ($nodouble eq 1);
$category_type="A" unless $category_type; # FIXME we should display a error message instead of a 500 error !
# if a add or modify is requested => check validity of data.
-%data= %$borrower_data if ($borrower_data);
+%data = %$borrower_data if ($borrower_data);
-my %newdata;
+my %newdata; # comes from $input->param()
if ($op eq 'insert' || $op eq 'modify' || $op eq 'save') {
my @names= ($borrower_data && $op ne 'save') ? keys %$borrower_data : $input->param();
foreach my $key (@names) {
$newdata{$key} = $input->param($key) if (defined $input->param($key));
$newdata{$key} =~ s/\"/"/gg unless $key eq 'borrowernotes' or $key eq 'opacnote';
}
- $newdata{'dateenrolled'}=format_date_in_iso($newdata{'dateenrolled'}) if ($newdata{dateenrolled});
- $newdata{'dateexpiry'} =format_date_in_iso($newdata{'dateexpiry'} ) if ($newdata{dateexpiry});
- $newdata{'dateofbirth'} =format_date_in_iso($newdata{'dateofbirth'} ) if ($newdata{dateofbirth});
+ my $dateobject = C4::Dates->new();
+ my $syspref = $dateobject->regexp(); # same syspref format for all 3 dates
+ my $iso = $dateobject->regexp('iso'); #
+ foreach (qw(dateenrolled dateexpiry dateofbirth)) {
+ my $userdate = $newdata{$_} or next;
+ if ($userdate =~ /$syspref/) {
+ $newdata{$_} = format_date_in_iso($userdate); # if they match syspref format, then convert to ISO
+ } elsif ($userdate =~ /$iso/) {
+ warn "Date $_ ($userdate) is already in ISO format";
+ } else {
+ ($userdate eq '0000-00-00') and warn "Data error: $_ is '0000-00-00'";
+ $template->param( "ERROR_$_" => 1 ); # else ERROR!
+ push(@errors,"ERROR_$_");
+ }
+ }
# check permission to modify login info.
if (ref($borrower_data) && ($borrower_data->{'category_type'} eq 'S') && ! (C4::Auth::haspermission($dbh,$userenv->{'id'},{'staffaccess'=>1})) ) {
$NoUpdateLogin =1;
if ($op eq 'insert'){
my $category_type_send=$category_type if ($category_type eq 'I');
my $check_category; # recover the category code of the doublon suspect borrowers
- ($check_member,$check_category)= checkuniquemember($category_type_send,($newdata{'surname'}?$newdata{'surname'}:$data{'surname'}),($newdata{'firstname'}?$newdata{'firstname'}:$data{'firstname'}),($newdata{'dateofbirth'}?$newdata{'dateofbirth'}:$data{'dateofbirth'}));
+ # ($result,$categorycode) = checkuniquemember($collectivity,$surname,$firstname,$dateofbirth)
+ ($check_member,$check_category) = checkuniquemember(
+ $category_type_send,
+ ($newdata{surname} ? $newdata{surname} : $data{surname} ),
+ ($newdata{firstname} ? $newdata{firstname} : $data{firstname} ),
+ ($newdata{dateofbirth} ? $newdata{dateofbirth} : $data{dateofbirth})
+ );
# recover the category type if the borrowers is a doublon
my $tmpborrowercategory=GetBorrowercategory($check_category);
my $guarantordata=GetMember($guarantorid);
$guarantorinfo=$guarantordata->{'surname'}." , ".$guarantordata->{'firstname'};
if (($data{'contactname'} eq '' or $data{'contactname'} ne $guarantordata->{'surname'})) {
- $data{'contactfirstname'}=$guarantordata->{'firstname'};
- $data{'contactname'}=$guarantordata->{'surname'};
- $data{'contacttitle'}=$guarantordata->{'title'};
- map {$data{$_}=$guarantordata->{$_}}('streetnumber','address','streettype','address2','zipcode','city','phone','phonepro','mobile','fax','email','emailpro');
+ $data{'contactfirstname'}= $guarantordata->{'firstname'};
+ $data{'contactname'} = $guarantordata->{'surname'};
+ $data{'contacttitle'} = $guarantordata->{'title'};
+ foreach (qw(streetnumber address streettype address2 zipcode city phone phonepro mobile fax email emailpro branchcode)) {
+ $data{$_} = $guarantordata->{$_};
+ }
}
}
}
#builds default userid
if ( (defined $newdata{'userid'}) && ($newdata{'userid'} eq '')){
- my $onefirstnameletter=substr($data{'firstname'},0,1);
- my $fivesurnameletter=substr($data{'surname'},0,9);
+ my $onefirstnameletter = substr($data{'firstname'},0,1);
+ my $fivesurnameletter = substr($data{'surname'},0,9);
$newdata{'userid'}=lc($onefirstnameletter.$fivesurnameletter);
}
+$debug and warn join "\t", map {"$_: $newdata{$_}"} qw(dateofbirth dateenrolled dateexpiry);
my $loginexist=0;
if ($op eq 'save' || $op eq 'insert'){
if (checkcardnumber($newdata{cardnumber},$newdata{borrowernumber})){
push @errors, 'ERROR_cardnumber';
- $nok = 1;
}
- my $dateofbirthmandatory=0;
- map {$dateofbirthmandatory=1 if $_ eq "dateofbirth"} @field_check;
+ my $dateofbirthmandatory = (scalar grep {$_ eq "dateofbirth"} @field_check) ? 1 : 0;
if ($newdata{dateofbirth} && $dateofbirthmandatory) {
my $age = GetAge($newdata{dateofbirth});
my $borrowercategory=GetBorrowercategory($newdata{'categorycode'});
- if (($age > $borrowercategory->{'upperagelimit'}) or ($age < $borrowercategory->{'dateofbirthrequired'})) {
+ my ($low,$high) = ($borrowercategory->{'dateofbirthrequired'}, $borrowercategory->{'upperagelimit'});
+ if (($high && ($age > $high)) or ($age < $low)) {
push @errors, 'ERROR_age_limitations';
- $nok = 1;
+ $template->param('ERROR_age_limitations' => "$low to $high");
}
}
-
if (C4::Context->preference("IndependantBranches")) {
if ($userenv && $userenv->{flags} != 1){
$debug and print STDERR " $newdata{'branchcode'} : ".$userenv->{flags}.":".$userenv->{branch};
unless (!$newdata{'branchcode'} || $userenv->{branch} eq $newdata{'branchcode'}){
push @errors, "ERROR_branch";
- $nok=1;
}
}
}
# Check if the userid is unique
- if (($op eq 'insert' || $op eq 'save') && !Check_Userid($newdata{'userid'},$borrowernumber)) {
+ unless (Check_Userid($newdata{'userid'},$borrowernumber)) {
push @errors, "ERROR_login_exist";
- $nok=1;
$loginexist=1;
}
}
}
}
-if ($op eq 'insert'){
- # Check if the userid is unique
- unless ($nok){
- $borrowernumber = &AddMember(%newdata);
- if ($data{'organisations'}){
- # need to add the members organisations
- my @orgs=split(/\|/,$data{'organisations'});
- add_member_orgs($borrowernumber,\@orgs);
- }
- if ($destination eq "circ") {
- print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$data{'cardnumber'}");
- } else {
- if ($loginexist == 0) {
- print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber");
- }
- }
- }
-}
-if ($op eq 'save'){
- # test to know if another user have the same password and same login
- unless ($nok){
- if($NoUpdateLogin) {
+### Error checks should happen before this line.
+
+$nok = $nok || scalar(@errors);
+if ((!$nok) and ($op eq 'insert' or $op eq 'save')){
+ $debug and warn "$op dates: " . join "\t", map {"$_: $newdata{$_}"} qw(dateofbirth dateenrolled dateexpiry);
+ if ($op eq 'insert'){
+ # we know it's not a duplicate borrowernumber or there would already be an error
+ $borrowernumber = &AddMember(%newdata);
+ if ($data{'organisations'}){
+ # need to add the members organisations
+ my @orgs=split(/\|/,$data{'organisations'});
+ add_member_orgs($borrowernumber,\@orgs);
+ }
+ } elsif ($op eq 'save'){
+ if ($NoUpdateLogin) {
delete $newdata{'password'};
delete $newdata{'userid'};
}
&ModMember(%newdata);
- if ($destination eq "circ") {
- print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$data{'cardnumber'}");
- } else {
- print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber");
- }
}
+ 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){
print $input->redirect("/cgi-bin/koha/deletemem.pl?member=$borrowernumber");
+ exit; # same as above
}
if ($nok){
$op="add" if ($op eq "insert");
$op="modify" if ($op eq "save");
%data=%newdata;
- $template->param( updtype => ($op eq "insert"?'I':'M'));
+ $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);
}
if ($userenv->{flags} != 1 && $data{branchcode}){
unless ($userenv->{branch} eq $data{'branchcode'}){
print $input->redirect("/cgi-bin/koha/members/members-home.pl");
+ exit;
}
}
}
if ($op eq 'add'){
- $template->param( updtype => 'I',step_1=>1,step_2=>1,step_3=>1);
+ my $arg2 = $newdata{'dateenrolled'} || sprintf('%04d-%02d-%02d', Today());
+ $data{'dateexpiry'} = GetExpiryDate($newdata{'categorycode'},$arg2);
+ $template->param( updtype => 'I',step_1=>1,step_2=>1,step_3=>1);
+
}
if ($op eq "modify") {
$template->param( updtype => 'M',modify => 1 );
-labels=>$labels);
$template->param(ethcatpopup => $ethcatpopup); # bad style, has to be fixed
}
-
-
-my $action="WHERE category_type=?";
-($categories,$labels)=GetborCatFromCatType($category_type,$action);
-
-if(scalar(@$categories)){
- #if you modify the borrowers you must have the right value for his category code
- my $default_category=$newdata{'categorycode'} if ($op eq 'modify');
- my $catcodepopup = CGI::popup_menu(
- -name=>'categorycode',
- -id => 'categorycode',
- -values=>$categories,
- -labels=>$labels,
- -default=>$default_category
- );
- $template->param(catcodepopup=>$catcodepopup);
-}
- #test in city
+
+my @typeloop;
+foreach (qw(C A S P I)){
+ my $action="WHERE category_type=?";
+ ($categories,$labels)=GetborCatFromCatType($_,$action);
+ my @categoryloop;
+ foreach my $cat (@$categories){
+ push @categoryloop,{'categorycode' => $cat,
+ 'categoryname' => $labels->{$cat},
+ 'categorycodeselected' => ($cat eq $borrower_data->{'categorycode'}),
+ };
+ }
+ my %typehash;
+ $typehash{'typename'}=$_;
+ $typehash{'categoryloop'}=\@categoryloop;
+ push @typeloop,{'typename' => $_,
+ 'categoryloop' => \@categoryloop};
+}
+$template->param('typeloop' => \@typeloop);
+
+# test in city
$select_city=getidcity($data{'city'}) if ($guarantorid ne '0');
($default_city=$select_city) if ($step eq 0);
if ($select_city eq '' ){
-my $selectcity=&getidcity($data{'city'});
-$default_city=$selectcity;
+ $default_city = &getidcity($data{'city'});
}
my($cityid);
($cityid,$name_city)=GetCities();
-values=>$name_city,
-labels=>$name_city,
-default=>$default_city,
- -onChange => "javascript:changecity()",
);
my $default_roadtype;
my $default_borrowertitle;
$default_borrowertitle=$data{'title'} ;
my($borrowertitle)=GetTitles();
+$template->param( title_cgipopup => 1) if ($borrowertitle);
my $borrotitlepopup = CGI::popup_menu(-name=>'title',
-id => 'btitle',
-values=>$borrowertitle,
-default=>$default_borrowertitle
);
-
my @relationships = split /,|\|/,C4::Context->preference('BorrowerRelationship');
my @relshipdata;
while (@relationships) {
}
push(@relshipdata, \%row);
}
-my %flags = ( 'gonenoaddress' => ['gonenoaddress', 'Gone no address '],
- 'lost' => ['lost', 'Lost'],
- 'debarred' => ['debarred', 'Debarred']);
+my %flags = ( 'gonenoaddress' => ['gonenoaddress' ],
+ 'lost' => ['lost'],
+ 'debarred' => ['debarred']);
+
+
my @flagdata;
foreach (keys(%flags)) {
-my $key = $_;
-my %row = ('key' => $key,
- 'name' => $flags{$key}[0],
- 'html' => $flags{$key}[1]);
-if ($data{$key}) {
- $row{'yes'}=' checked';
- $row{'no'}='';
-} else {
- $row{'yes'}='';
- $row{'no'}=' checked';
-}
-push(@flagdata, \%row);
+ 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 Branches
my @branches;
my @select_branch;
# --------------------------------------------------------------------------------------------------------
#in modify mod :default value from $CGIbranch comes from borrowers table
#in add mod: default value come from branches table (ip correspendence)
-$default=$data{'branchcode'} if ($op eq 'modify');
+$default=$data{'branchcode'} if ($op eq 'modify' || ($op eq 'add' && $category_type eq 'C'));
my $CGIbranch = CGI::scrolling_list(-id => 'branchcode',
-name => 'branchcode',
-values => \@select_branch,
# --------------------------------------------------------------------------------------------------------
-my $CGIsort1 = buildCGIsort("Bsort1","sort1",$data{'sort1'});
-if ($CGIsort1) {
- $template->param(CGIsort1 => $CGIsort1);
+my $CGIsort = buildCGIsort("Bsort1","sort1",$data{'sort1'});
+if ($CGIsort) {
+ $template->param(CGIsort1 => $CGIsort);
}
-$template->param( sort1 => $data{'sort1'});
+$template->param( sort1 => $data{'sort1'}); # shouldn't this be in an "else" statement like the 2nd one?
-my $CGIsort2 = buildCGIsort("Bsort2","sort2",$data{'sort2'});
-if ($CGIsort2) {
- $template->param(CGIsort2 =>$CGIsort2);
+$CGIsort = buildCGIsort("Bsort2","sort2",$data{'sort2'});
+if ($CGIsort) {
+ $template->param(CGIsort2 => $CGIsort);
} else {
$template->param( sort2 => $data{'sort2'});
}
+
if ($nok) {
foreach my $error (@errors) {
- $template->param( $error => 1);
+ $template->param($error) || $template->param( $error => 1);
}
$template->param(nok => 1);
}
#Formatting data for display
if ($data{'dateenrolled'} eq ''){
- my $today= sprintf('%04d-%02d-%02d', Today());
+ my $today = sprintf('%04d-%02d-%02d', Today()); # ISO format
$data{'dateenrolled'}=$today;
}
if (C4::Context->preference('uppercasesurnames')) {
$data{'surname'} =uc($data{'surname'} );
$data{'contactname'}=uc($data{'contactname'});
}
-$data{'dateenrolled'} = format_date($data{'dateenrolled'});
-$data{'dateexpiry'} = format_date($data{'dateexpiry'});
-$data{'dateofbirth'} = format_date($data{'dateofbirth'});
+foreach (qw(dateenrolled dateexpiry dateofbirth)) {
+ $data{$_} = format_date($data{$_}); # back to syspref for display
+ $template->param( $_ => $data{$_});
+}
$template->param( "showguarantor" => ($category_type=~/A|I|S/) ? 0 : 1); # associate with step to know where you are
$debug and warn "memberentry step: $step";
$template->param(%data);
-$template->param( "step_$step" => 1) if $step;# associate with step to know where u are
-$template->param( "step" => $step) if $step;# associate with step to know where u are
+$template->param( "step_$step" => 1) if $step; # associate with step to know where u are
+$template->param( step => $step ) if $step; # associate with step to know where u are
+$template->param( debug => $debug ) if $debug;
$template->param(
BorrowerMandatoryField => C4::Context->preference("BorrowerMandatoryField"),#field to test with javascript
category_type => $category_type,#to know the category type of the borrower
guarantorinfo => $guarantorinfo,
flagloop => \@flagdata,
dateformat => C4::Dates->new()->visual(),
+ C4::Context->preference('dateformat') => 1,
check_categorytype =>$check_categorytype,#to recover the category type with checkcategorytype function
modify => $modify,
nok => $nok,#flag to konw if an error
projects / koha.git / blobdiff