Update of /cvsroot/koha/koha In directory usw-pr-cvs1:/tmp/cvs-serv24070 Modified Files: moremember.pl Log Message: Fix so that reserves are only showing for the biblioitem not the biblio on the moremembers screen Index: moremember.pl =================================================================== RCS file: /cvsroot/koha/koha/moremember.pl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** moremember.pl 2 May 2001 21:11:41 -0000 1.6 --- moremember.pl 13 Mar 2002 02:03:56 -0000 1.7 *************** *** 60,63 **** --- 60,75 ---- Card Number: $data->{'cardnumber'}<BR> + printend + ; + if ($data->{'categorycode'} eq 'C'){ + my $data2=borrdata('',$data->{'guarantor'}); + $data->{'streetaddress'}=$data2->{'streetaddress'}; + $data->{'city'}=$data2->{'city'}; + $data->{'physstreet'}=$data2->{'phystreet'}; + $data->{'streetcity'}=$data2->{'streetcity'}; + $data->{'phone'}=$data2->{'phone'}; + $data->{'phoneday'}=$data2->{'phoneday'}; + } + print <<printend Postal Address: $data->{'streetaddress'}, $data->{'city'}<BR> Home Address: $data->{'physstreet'}, $data->{'streetcity'}<BR> *************** *** 65,69 **** Phone (Daytime): $data->{'phoneday'}<BR> Fax: $data->{'faxnumber'}<BR> ! E-mail: <a href="mailto:$data->{'emailaddress'}">$data->{'emailaddress'}</a><P> Membership Number: $data->{'borrowernumber'}<BR> Membership: $data->{'categorycode'}<BR> --- 77,82 ---- Phone (Daytime): $data->{'phoneday'}<BR> Fax: $data->{'faxnumber'}<BR> ! E-mail: <a href="mailto:$data->{'emailaddress'}">$data->{'emailaddress'}</a><br> ! Textmessaging:$data->{'textmessaging'}<p> Membership Number: $data->{'borrowernumber'}<BR> Membership: $data->{'categorycode'}<BR> *************** *** 80,89 **** Relationship: $data->{'altrelationship'}<BR> Notes: $data->{'altnotes'}<P> - Guarantees: printend ; ! my ($count,$guarantees)=findguarantees($data->{'borrowernumber'}); ! for (my $i=0;$i<$count;$i++){ ! print "<A HREF=\"/cgi-bin/koha/moremember.pl?bornum=$guarantees->[$i]->{'borrowernumber'}\">$guarantees->[$i]->{'cardnumber'}</a><br>"; } print <<printend --- 93,113 ---- Relationship: $data->{'altrelationship'}<BR> Notes: $data->{'altnotes'}<P> printend ; ! ! if ($data->{'categorycode'} ne 'C'){ ! print " Guarantees:"; ! my ($count,$guarantees)=findguarantees($data->{'borrowernumber'}); ! for (my $i=0;$i<$count;$i++){ ! print "<A HREF=\"/cgi-bin/koha/moremember.pl?bornum=$guarantees->[$i]->{'borrowernumber'}\">$guarantees->[$i]->{'cardnumber'}</a><br>"; ! } ! } else { ! print "Guarantor:"; ! my ($guarantor)=findguarantor($data->{'borrowernumber'}); ! if ($guarantor->{'borrowernumber'} == 0){ ! print "no guarantor<br>"; ! } else { ! print "<A HREF=\"/cgi-bin/koha/moremember.pl?bornum=$guarantor->{'borrowernumber'}\">$guarantor->{'cardnumber'}</a><br>"; ! } } print <<printend *************** *** 203,207 **** # } #check item is not reserved ! my ($rescount,$reserves)=FindReserves($issue->[$i]{'biblionumber'},''); if ($rescount >0){ print "<TD><a href=/cgi-bin/koha/request.pl?bib=$issue->[$i]{'biblionumber'}>On Request - no renewals</a></td></tr>"; --- 227,231 ---- # } #check item is not reserved ! my ($rescount,$reserves)=Findgroupreserve($issue->[$i]{'biblionumber'},''); if ($rescount >0){ print "<TD><a href=/cgi-bin/koha/request.pl?bib=$issue->[$i]{'biblionumber'}>On Request - no renewals</a></td></tr>"; *************** *** 258,262 **** $reserves->[$i]{'reservedate'}="$temp[2]/$temp[1]/$temp[0]"; print "<tr VALIGN=TOP > ! <TD><a href=\"/cgi-bin/koha/request.pl?bib=$reserves->[$i]{'biblionumber'}\">$reserves->[$i]{'title'}</a></td> <TD>$reserves->[$i]{'reservedate'}</td> <input type=hidden name=biblio value=$reserves->[$i]{'biblionumber'}> --- 282,286 ---- $reserves->[$i]{'reservedate'}="$temp[2]/$temp[1]/$temp[0]"; print "<tr VALIGN=TOP > ! <TD><a href=\"/cgi-bin/koha/request.pl?bib=$reserves->[$i]{'biblionumber'}\">$reserves->[$i]{'btitle'}</a></td> <TD>$reserves->[$i]{'reservedate'}</td> <input type=hidden name=biblio value=$reserves->[$i]{'biblionumber'}>