From rangi@users.sourceforge.net Tue Mar 12 18:04:00 2002
From: Chris Cormack <rangi@users.sourceforge.net>
To: koha-devel@lists.koha-community.org
Subject: [Koha-devel] CVS: koha moremember.pl,1.6,1.7
Date: Tue, 12 Mar 2002 18:04:11 +0000
Message-ID: <E16ky7T-0006JE-00@usw-pr-cvs1.sourceforge.net>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0915405393664438882=="

--===============0915405393664438882==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv24070

Modified Files:
	moremember.pl=20
Log Message:
Fix so that reserves are only showing for the biblioitem not the biblio on
the moremembers screen


Index: moremember.pl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
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 ----
 =20
  Card Number: $data->{'cardnumber'}<BR>
+ printend
+ ;
+ if ($data->{'categorycode'} eq 'C'){
+     my $data2=3Dborrdata('',$data->{'guarantor'});
+     $data->{'streetaddress'}=3D$data2->{'streetaddress'};
+     $data->{'city'}=3D$data2->{'city'};
+     $data->{'physstreet'}=3D$data2->{'phystreet'};
+     $data->{'streetcity'}=3D$data2->{'streetcity'};
+     $data->{'phone'}=3D$data2->{'phone'};
+     $data->{'phoneday'}=3D$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=3D"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=3D"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)=3Dfindguarantees($data->{'borrowernumber'});
! for (my $i=3D0;$i<$count;$i++){
!   print "<A HREF=3D\"/cgi-bin/koha/moremember.pl?bornum=3D$guarantees->[$i]=
->{'borrowernumber'}\">$guarantees->[$i]->{'cardnumber'}</a><br>";
  }
  print <<printend
--- 93,113 ----
  Relationship: $data->{'altrelationship'}<BR>
  Notes: $data->{'altnotes'}<P>
  printend
  ;
!=20
! if ($data->{'categorycode'} ne 'C'){
!   print " Guarantees:";
!   my ($count,$guarantees)=3Dfindguarantees($data->{'borrowernumber'});
!   for (my $i=3D0;$i<$count;$i++){
!     print "<A HREF=3D\"/cgi-bin/koha/moremember.pl?bornum=3D$guarantees->[$=
i]->{'borrowernumber'}\">$guarantees->[$i]->{'cardnumber'}</a><br>";
!   }
! } else {
!   print "Guarantor:";
!   my ($guarantor)=3Dfindguarantor($data->{'borrowernumber'});
!   if ($guarantor->{'borrowernumber'} =3D=3D 0){
!       print "no guarantor<br>";
!   } else {
!     print "<A HREF=3D\"/cgi-bin/koha/moremember.pl?bornum=3D$guarantor->{'b=
orrowernumber'}\">$guarantor->{'cardnumber'}</a><br>";
!   }
  }
  print <<printend
***************
*** 203,207 ****
  #  }
    #check item is not reserved
!   my ($rescount,$reserves)=3DFindReserves($issue->[$i]{'biblionumber'},'');
    if ($rescount >0){
      print "<TD><a href=3D/cgi-bin/koha/request.pl?bib=3D$issue->[$i]{'bibli=
onumber'}>On Request - no renewals</a></td></tr>";
--- 227,231 ----
  #  }
    #check item is not reserved
!   my ($rescount,$reserves)=3DFindgroupreserve($issue->[$i]{'biblionumber'},=
'');
    if ($rescount >0){
      print "<TD><a href=3D/cgi-bin/koha/request.pl?bib=3D$issue->[$i]{'bibli=
onumber'}>On Request - no renewals</a></td></tr>";
***************
*** 258,262 ****
    $reserves->[$i]{'reservedate'}=3D"$temp[2]/$temp[1]/$temp[0]";
    print "<tr VALIGN=3DTOP  >
!   <TD><a href=3D\"/cgi-bin/koha/request.pl?bib=3D$reserves->[$i]{'biblionum=
ber'}\">$reserves->[$i]{'title'}</a></td>
    <TD>$reserves->[$i]{'reservedate'}</td>
    <input type=3Dhidden name=3Dbiblio value=3D$reserves->[$i]{'biblionumber'=
}>
--- 282,286 ----
    $reserves->[$i]{'reservedate'}=3D"$temp[2]/$temp[1]/$temp[0]";
    print "<tr VALIGN=3DTOP  >
!   <TD><a href=3D\"/cgi-bin/koha/request.pl?bib=3D$reserves->[$i]{'biblionum=
ber'}\">$reserves->[$i]{'btitle'}</a></td>
    <TD>$reserves->[$i]{'reservedate'}</td>
    <input type=3Dhidden name=3Dbiblio value=3D$reserves->[$i]{'biblionumber'=
}>



--===============0915405393664438882==--