A new Date.pm to use for all date calculations. Mysql date calculations removed from...

[koha-ffzg.git] / C4 / Letters.pm

diff --git a/C4/Letters.pm b/C4/Letters.pm
index 10b545c..8bba5d7 100644 (file)
--- a/C4/Letters.pm
+++ b/C4/Letters.pm
@@ -21,7 +21,6 @@ package C4::Letters;
 use strict;
 use Mail::Sendmail;
 use C4::Date;
-use Date::Manip;
 use C4::Suggestions;
 use C4::Members;
 require Exporter;
@@ -195,7 +194,6 @@ sub findrelatedto {
 
 sub sendalerts {
        my ($type,$externalid,$letter)=@_;
-       warn "sendalerts : ($type,$externalid,$letter)";
        my $dbh=C4::Context->dbh;
        if ($type eq 'issue') {
 #              warn "sending issues...";
@@ -205,15 +203,24 @@ sub sendalerts {
                my $sth=$dbh->prepare("select biblionumber from subscription where subscriptionid=?");
                $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);
                # find the list of borrowers to alert
                my $alerts = getalert('','issue',$externalid);
                foreach (@$alerts) {
+                       # and parse borrower ...
                        my $innerletter = $letter;
                        my $borinfo = getmember('',$_->{'borrowernumber'});
                        parseletter($innerletter,'borrowers',$_->{'borrowernumber'});
-                       my $userenv = C4::Context->userenv;
+                       # ... then send mail
                        if ($borinfo->{emailaddress}) {
                                my %mail = ( To => $borinfo->{emailaddress},
                                                        From => $userenv->{emailaddress},
@@ -233,6 +240,7 @@ sub sendalerts {
        - $table : the Koha table to parse.
        - $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 {
        my ($letter,$table,$pk) = @_;
@@ -245,6 +253,8 @@ sub parseletter {
                $sth = $dbh->prepare("select * from biblioitems where biblionumber=?");
        } 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);
        # store the result in an hash