Bugzilla – Attachment 9090 Details for
Bug 7756
claim mail is not sent for serial claim
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED-OFF] Bug 7756: FIX send email for late orders
SIGNED-OFF-Bug-7756-FIX-send-email-for-late-orders.patch (text/plain), 2.82 KB, created by
Katrin Fischer
on 2012-04-10 19:53:11 UTC
(
hide
)
Description:
[SIGNED-OFF] Bug 7756: FIX send email for late orders
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2012-04-10 19:53:11 UTC
Size:
2.82 KB
patch
obsolete
>From cb8a9f1d7ef6962ca5c66c0c0efbfa2118f8140a Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Tue, 10 Apr 2012 10:06:59 +0200 >Subject: [PATCH] [SIGNED-OFF] Bug 7756: FIX send email for late orders > >Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> >- sending claim mails works now >- claim counter is not increased when vendor has no email address >--- > C4/Letters.pm | 8 +++++--- > acqui/lateorders.pl | 6 ++++-- > 2 files changed, 9 insertions(+), 5 deletions(-) > >diff --git a/C4/Letters.pm b/C4/Letters.pm >index 5a929d0..89213fe 100644 >--- a/C4/Letters.pm >+++ b/C4/Letters.pm >@@ -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} ), >diff --git a/acqui/lateorders.pl b/acqui/lateorders.pl >index 21ee186..031fc88 100755 >--- a/acqui/lateorders.pl >+++ b/acqui/lateorders.pl >@@ -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; >-- >1.7.5.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 7756
:
9066
| 9090