From e90b81528981ca3ac030515377478d11b7904284 Mon Sep 17 00:00:00 2001 From: tipaul Date: Mon, 5 May 2003 13:26:00 +0000 Subject: [PATCH] fix for #218 --- insertjdata.pl | 107 +++++++++--------- jmemberentry.pl | 2 +- .../default/en/members/jmemberentry.tmpl | 2 +- moremember.pl | 4 +- 4 files changed, 58 insertions(+), 57 deletions(-) diff --git a/insertjdata.pl b/insertjdata.pl index 13d708768a..d66930b36e 100755 --- a/insertjdata.pl +++ b/insertjdata.pl @@ -40,62 +40,63 @@ my $keyval; my $problems; my $env; foreach my $key (@names){ - $data{$key}=$input->param($key); + $data{$key}=$input->param($key); } my $dbh = C4::Context->dbh; - +my $query; for (my $i=0;$i<3;$i++){ -my $query="Select * from borrowers where borrowernumber=$data{'bornumber_child_$i'}"; -my $sth=$dbh->prepare($query); -$sth->execute; -if (my $data=$sth->fetchrow_hashref){ - $query="update borrowers set title='$data{'title'}',expiry='$data{'expiry'}', - cardnumber='$data{'cardnumber'}',sex='$data{'sex'}',ethnotes='$data{'ethnicnotes'}', - streetaddress='$data{'address'}',faxnumber='$data{'faxnumber'}',firstname='$data{'firstname'}', - altnotes='$data{'altnotes'}',dateofbirth='$data{'dateofbirth'}',contactname='$data{'contactname'}', - emailaddress='$data{'emailaddress'}',dateenrolled='$data{'joining'}',streetcity='$data{'streetcity'}', - altrelationship='$data{'altrelationship'}',othernames='$data{'othernames'}',phoneday='$data{'phoneday'}', - categorycode='$data{'categorycode'}',city='$data{'city'}',area='$data{'area'}',phone='$data{'phone'}', - borrowernotes='$data{'borrowernotes'}',altphone='$data{'altphone'}',surname='$data{'surname'}', - initials='$data{'initials'}',streetaddress='$data{'address'}',ethnicity='$data{'ethnicity'}' - where borrowernumber=$data{'borrowernumber'}"; -# print $query; - -}elsif ($data{"cardnumber_child_$i"} ne ''){ - my $dob=$data{"dateofbirth_child_$i"}; - $dob=ParseDate($dob); - $dob=UnixDate($dob,'%Y-%m-%d'); - $data{'joining'}=ParseDate("today"); - $data{'joining'}=UnixDate($data{'joining'},'%Y-%m-%d'); - my $cardnumber=$data{"cardnumber_child_$i"}; - my $bornum=$data{"bornumber_child_$i"}; - my $firstname=$data{"firstname_child_$i"}; - my $surname=$data{"surname_child_$i"}; - my $school=$data{"school_child_$i"}; - my $guarant=$data{'borrowernumber'}; - my $notes=$data{"altnotes_child_$i"}; - my $sex=$data{"sex_child_$i"}; - $data{'contactname'}=$data{'firstname_guardian'}." ".$data{'surname_guardian'}; - $data{'altrelationship'}="Guarantor"; - $data{'altphone'}=$data{'phone'}; - $query="insert into borrowers (title,expiry,cardnumber,sex,ethnotes,streetaddress,faxnumber, - firstname,altnotes,dateofbirth,contactname,emailaddress,dateenrolled,streetcity, - altrelationship,othernames,phoneday,categorycode,city,area,phone,borrowernotes,altphone,surname, - initials,ethnicity,borrowernumber,guarantor,school) - values ('','$data{'expiry'}', - '$cardnumber', - '$sex','$data{'ethnotes'}','$data{'address'}','$data{'faxnumber'}', - '$firstname','$data{'altnotes'}','$dob','$data{'contactname'}','$data{'emailaddress'}', - '$data{'joining'}','$data{'streetcity'}','$data{'altrelationship'}','$data{'othernames'}', - '$data{'phoneday'}','C','$data{'city'}','$data{'area'}','$data{'phone'}', - '$notes','$data{'altphone'}','$surname','$data{'initials'}', - '$data{'ethnicity'}','$bornum','$guarant','$school')"; -} + my $x = "cardnumber_child_$i"; + my $sth=$dbh->prepare("Select * from borrowers where borrowernumber=?"); + $sth->execute($x); + if (my $data=$sth->fetchrow_hashref){ + $query="update borrowers set title='$data{'title'}',expiry='$data{'expiry'}', + cardnumber='$data{'cardnumber'}',sex='$data{'sex'}',ethnotes='$data{'ethnicnotes'}', + streetaddress='$data{'address'}',faxnumber='$data{'faxnumber'}',firstname='$data{'firstname'}', + altnotes='$data{'altnotes'}',dateofbirth='$data{'dateofbirth'}',contactname='$data{'contactname'}', + emailaddress='$data{'emailaddress'}',dateenrolled='$data{'joining'}',streetcity='$data{'streetcity'}', + altrelationship='$data{'altrelationship'}',othernames='$data{'othernames'}',phoneday='$data{'phoneday'}', + categorycode='$data{'categorycode'}',city='$data{'city'}',area='$data{'area'}',phone='$data{'phone'}', + borrowernotes='$data{'borrowernotes'}',altphone='$data{'altphone'}',surname='$data{'surname'}', + initials='$data{'initials'}',streetaddress='$data{'streetaddress'}',ethnicity='$data{'ethnicity'}',physstreet='$data{'physstreet'}' + where borrowernumber=$data{'borrowernumber'}"; + # print $query; + }elsif ($data{"cardnumber_child_$i"} ne ''){ + warn "INSERT"; + my $dob=$data{"dateofbirth_child_$i"}; + $dob=ParseDate($dob); + $dob=UnixDate($dob,'%Y-%m-%d'); + $data{'joining'}=ParseDate("today"); + $data{'joining'}=UnixDate($data{'joining'},'%Y-%m-%d'); + my $cardnumber=$data{"cardnumber_child_$i"}; + my $bornum=$data{"bornumber_child_$i"}; + my $firstname=$data{"firstname_child_$i"}; + my $surname=$data{"surname_child_$i"}; + my $school=$data{"school_child_$i"}; + my $guarant=$data{'borrowernumber'}; + my $notes=$data{"altnotes_child_$i"}; + my $sex=$data{"sex_child_$i"}; + $data{'contactname'}=$data{'firstname_guardian'}." ".$data{'surname_guardian'}; + $data{'altrelationship'}="Guarantor"; + $data{'altphone'}=$data{'phone'}; + $query="insert into borrowers (title,expiry,cardnumber,sex,ethnotes,streetaddress,faxnumber, + firstname,altnotes,dateofbirth,contactname,emailaddress,dateenrolled,streetcity, + altrelationship,othernames,phoneday,categorycode,city,area,phone,borrowernotes,altphone,surname, + initials,ethnicity,borrowernumber,guarantor,school,physstreet) + values ('','$data{'expiry'}', + '$cardnumber', + '$sex','$data{'ethnotes'}','$data{'address'}','$data{'faxnumber'}', + '$firstname','$data{'altnotes'}','$dob','$data{'contactname'}','$data{'emailaddress'}', + '$data{'joining'}','$data{'streetcity'}','$data{'altrelationship'}','$data{'othernames'}', + '$data{'phoneday'}','C','$data{'city'}','$data{'area'}','$data{'phone'}', + '$notes','$data{'altphone'}','$surname','$data{'initials'}', + '$data{'ethnicity'}','$bornum','$guarant','$school','$data{'physstreet'}')"; -#print $query; - my $sth2=$dbh->prepare($query); - $sth2->execute; - $sth2->finish; -$sth->finish; + } + #print $query; + my $sth2=$dbh->prepare($query); + warn "QQQ = $query"; + $sth2->execute; + $sth2->finish; + $sth->finish; } print $input->redirect("/cgi-bin/koha/moremember.pl?bornum=$data{'borrowernumber'}"); diff --git a/jmemberentry.pl b/jmemberentry.pl index ebbea8238d..577cb454ac 100755 --- a/jmemberentry.pl +++ b/jmemberentry.pl @@ -81,7 +81,7 @@ $template->param( member => $member, cardnumber => $data->{'cardnumber'}, area => $data->{'area'}, city => $data->{'city'}, - address => $data->{'address'}, + physstreet => $data->{'physstreet'}, streetaddress => $data->{'streetaddress'}, streetcity => $data->{'streetcity'}, phone => $data->{'phone'}, diff --git a/koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl index bb83446cf1..ccb2cde1a3 100644 --- a/koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl @@ -9,7 +9,7 @@ - + diff --git a/moremember.pl b/moremember.pl index 50ddd24763..b808aafcec 100755 --- a/moremember.pl +++ b/moremember.pl @@ -78,7 +78,7 @@ if ($data->{'categorycode'} eq 'C'){ my $data2=borrdata('',$data->{'guarantor'}); $data->{'streetaddress'}=$data2->{'streetaddress'}; $data->{'city'}=$data2->{'city'}; - $data->{'physstreet'}=$data2->{'phystreet'}; + $data->{'physstreet'}=$data2->{'physstreet'}; $data->{'streetcity'}=$data2->{'streetcity'}; $data->{'phone'}=$data2->{'phone'}; $data->{'phoneday'}=$data2->{'phoneday'}; @@ -192,7 +192,7 @@ foreach my $reserveline (@$reserves) { my %row = %$reserveline; if ($reserveline->{'constrainttype'} eq 'o'){ $restitle=getreservetitle($reserveline->{'biblionumber'},$reserveline->{'borrowernumber'},$reserveline->{'reservedate'},$reserveline->{'timestamp'}); - %row = (%row , %$restitle); + %row = (%row , %$restitle) if $restitle; } push (@reservedata, \%row); } -- 2.39.2