[Koha-cvs] CVS: koha/C4 Letters.pm,1.3,1.4

[Paul POULAIN]

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

Modified Files:
	Letters.pm 
Log Message:
adding some fields available for Letters

Index: Letters.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Letters.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Letters.pm	5 Aug 2005 14:48:52 -0000	1.3
--- Letters.pm	5 Aug 2005 15:50:46 -0000	1.4
***************
*** 196,200 ****
  sub sendalerts {
  	my ($type,$externalid,$letter)=@_;
- 	warn "sendalerts : ($type,$externalid,$letter)";
  	my $dbh=C4::Context->dbh;
  	if ($type eq 'issue') {
--- 196,199 ----
***************
*** 206,209 ****
--- 205,216 ----
  		$sth->execute($externalid);
  		my ($biblionumber)=$sth->fetchrow;
+ 		# parsing branch info
+ 		my $userenv = C4::Context->userenv;
+ 		parseletter($letter,'branches',$userenv->{branch});
+ 		# parsing librarian name
+ 		$letter->{content} =~ s/<<LibrarianFirstname>>/$userenv->{firstname}/g;
+ 		$letter->{content} =~ s/<<LibrarianSurname>>/$userenv->{surname}/g;
+ 		$letter->{content} =~ s/<<LibrarianEmailaddress>>/$userenv->{emailaddress}/g;
+ 		# parsing biblio information
  		parseletter($letter,'biblio',$biblionumber);
  		parseletter($letter,'biblioitems',$biblionumber);
***************
*** 211,218 ****
  		my $alerts = getalert('','issue',$externalid);
  		foreach (@$alerts) {
  			my $innerletter = $letter;
  			my $borinfo = getmember('',$_->{'borrowernumber'});
  			parseletter($innerletter,'borrowers',$_->{'borrowernumber'});
! 			my $userenv = C4::Context->userenv;
  			if ($borinfo->{emailaddress}) {
  				my %mail = ( To => $borinfo->{emailaddress},
--- 218,226 ----
  		my $alerts = getalert('','issue',$externalid);
  		foreach (@$alerts) {
+ 			# and parse borrower ...
  			my $innerletter = $letter;
  			my $borinfo = getmember('',$_->{'borrowernumber'});
  			parseletter($innerletter,'borrowers',$_->{'borrowernumber'});
! 			# ... then send mail
  			if ($borinfo->{emailaddress}) {
  				my %mail = ( To => $borinfo->{emailaddress},
***************
*** 234,237 ****
--- 242,246 ----
  	- $pk : the primary key to query on the $table table
  	parse all fields from a table, and replace values in title & content with the appropriate value
+ 	(not exported sub, used only internally)
  =cut
  sub parseletter {
***************
*** 246,249 ****
--- 255,260 ----
  	} elsif ($table eq 'borrowers') {
  		$sth = $dbh->prepare("select * from borrowers where borrowernumber=?");
+ 	} elsif ($table eq 'branches') {
+ 		$sth = $dbh->prepare("select * from branches where branchcode=?");
  	}
  	$sth->execute($pk);