Commit 763d6973 authored by joubu's avatar joubu Committed by Paul Poulain

Bug 7756: FIX send email for late orders

Signed-off-by: Katrin Fischer's avatarKatrin Fischer <Katrin.Fischer.83@web.de>
- sending claim mails works now
- claim counter is not increased when vendor has no email address
Signed-off-by: default avatarPaul Poulain <paul.poulain@biblibre.com>
parent 5483ec62
......@@ -307,7 +307,8 @@ sub SendAlerts {
# search the biblionumber
my $strsth = $type eq 'claimacquisition'
? qq{
SELECT aqorders.*,aqbasket.*,biblio.*,biblioitems.*,aqbooksellers.*
SELECT aqorders.*,aqbasket.*,biblio.*,biblioitems.*,aqbooksellers.*,
aqbooksellers.id AS booksellerid
FROM aqorders
LEFT JOIN aqbasket ON aqbasket.basketno=aqorders.basketno
LEFT JOIN biblio ON aqorders.biblionumber=biblio.biblionumber
......@@ -316,7 +317,8 @@ sub SendAlerts {
WHERE aqorders.ordernumber IN (
}
: qq{
SELECT serial.*,subscription.*, biblio.*, aqbooksellers.*
SELECT serial.*,subscription.*, biblio.*, aqbooksellers.*,
aqbooksellers.id AS booksellerid
FROM serial
LEFT JOIN subscription ON serial.subscriptionid=subscription.subscriptionid
LEFT JOIN biblio ON serial.biblionumber=biblio.biblionumber
......@@ -356,7 +358,7 @@ sub SendAlerts {
# ... then send mail
my %mail = (
To => join( ','. @email),
To => join( ',', @email),
From => $userenv->{emailaddress},
Subject => Encode::encode( "utf8", "" . $letter->{title} ),
Message => Encode::encode( "utf8", "" . $letter->{content} ),
......
......@@ -81,11 +81,13 @@ if ($op and $op eq "send_alert"){
my $err;
eval {
$err = SendAlerts( 'claimacquisition', \@ordernums, $input->param("letter_code") ); # FIXME: Fallback value?
AddClaim ( $_ ) for @ordernums;
if ( not ref $err or not exists $err->{error} ) {
AddClaim ( $_ ) for @ordernums;
}
};
if ( $@ ) {
$template->param(error_claim => $@);
} elsif ( defined $err->{error} and $err->{error} eq "no_email" ) {
} elsif ( ref $err and exists $err->{error} and $err->{error} eq "no_email" ) {
$template->{VARS}->{'error_claim'} = "no_email";
} else {
$template->{VARS}->{'info_claim'} = 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment