[Koha-cvs] CVS: koha/circ returns.pl,1.37,1.37.2.1

[Owen Leonard]

Update of /cvsroot/koha/koha/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4168/circ

Modified Files:
      Tag: rel_2_2
	returns.pl 
Log Message:
Adding several variables to template output:
 - member email
 - member flags debarred and gonenoaddress (relevant to reserves notification)
 - information about current branch and destination branch of reserves (for reserves transfers)

Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.37
retrieving revision 1.37.2.1
diff -C2 -r1.37 -r1.37.2.1
*** returns.pl	3 May 2004 09:02:14 -0000	1.37
--- returns.pl	10 Aug 2005 17:30:12 -0000	1.37.2.1
***************
*** 202,205 ****
--- 202,211 ----
  
      if ( $res->{'ResFound'} eq "Waiting" ) {
+ 		if($branch eq $res->{'branchcode'}){
+ 			$template->param(intransit => 0);
+ 		} else {
+ 			$template->param(intransit => 1);
+ 		}
+ 	
          $template->param(
              found         => 1,
***************
*** 209,212 ****
--- 215,219 ----
              bortitle      => $borr->{'title'},
              borphone      => $borr->{'phone'},
+             boremail         => $borr->{'emailaddress'},
              borstraddress => $borr->{'streetaddress'},
              borcity       => $borr->{'city'},
***************
*** 214,217 ****
--- 221,227 ----
              bornum        => $res->{'borrowernumber'},
              borcnum       => $borr->{'cardnumber'},
+ 			debarred => $borr->{'debarred'},
+ 			gonenoaddress => $borr->{'gonenoaddress'},
+ 			currentbranch => $branches->{ $branch }->{'branchname'},
              branchname  => $branches->{ $res->{'branchcode'} }->{'branchname'},
              waiting     => 1,
***************
*** 231,236 ****
--- 241,254 ----
            . sprintf( "%0.2d", ( $da[4] + 1 ) ) . "/"
            . ( $da[5] + 1900 );
+ 		  
+ 		 if($branch eq $res->{'branchcode'}){
+ 			$template->param(intransit => 0);
+ 		} else {
+ 			$template->param(intransit => 1);
+ 		}
+ 		  
          $template->param(
              found       => 1,
+ 		currentbranch => $branches->{ $branch }->{'branchname'},
              branchname  => $branches->{ $res->{'branchcode'} }->{'branchname'},
              reserved    => 1,
***************
*** 252,256 ****
              borcity          => $borr->{'city'},
              borzip           => $borr->{'zipcode'},
!             boremail         => $borr->{'emailadress'},
              barcode          => $barcode
          );
--- 270,276 ----
              borcity          => $borr->{'city'},
              borzip           => $borr->{'zipcode'},
!             boremail         => $borr->{'emailaddress'},
! 			debarred => $borr->{'debarred'},
! 			gonenoaddress => $borr->{'gonenoaddress'},
              barcode          => $barcode
          );