Merge remote-tracking branch 'origin/new/bug_6210'

[koha_gimpoz] / acqui / lateorders.pl

diff --git a/acqui/lateorders.pl b/acqui/lateorders.pl
index 810f665..55031ec 100755 (executable)
--- a/acqui/lateorders.pl
+++ b/acqui/lateorders.pl
@@ -76,6 +76,22 @@ unless ($delay =~ /^\d{1,3}$/) {
        $delay = 30;    #default value for delay
 }
 
+if ($op and $op eq "send_alert"){
+    my @ordernums = $input->param("claim_for");# FIXME: Fallback values?
+    my $err;
+    eval {
+        $err = SendAlerts( 'claimacquisition', \@ordernums, $input->param("letter_code") );    # FIXME: Fallback value?
+        AddClaim ( $_ ) for @ordernums;
+    };
+    if ( $@ ) {
+        $template->param(error_claim => $@);
+    } elsif ( defined $err->{error} and $err->{error} eq "no_email" ) {
+        $template->{VARS}->{'error_claim'} = "no_email";
+    } else {
+        $template->{VARS}->{'info_claim'} = 1;
+    }
+}
+
 my %supplierlist = GetBooksellersWithLateOrders($delay);
 my (@sloopy);  # supplier loop
 foreach (keys %supplierlist){
@@ -85,6 +101,7 @@ foreach (keys %supplierlist){
 }
 $template->param(SUPPLIER_LOOP => \@sloopy);
 $template->param(Supplier=>$supplierlist{$supplierid}) if ($supplierid);
+$template->param(SupplierId=>$supplierid) if ($supplierid);
 
 my @lateorders = GetLateOrders($delay,$supplierid,$branch);
 
@@ -100,11 +117,6 @@ foreach (keys %$letters){
 }
 $template->param(letters=>\@letters) if (@letters);
 
-if ($op and $op eq "send_alert"){
-       my @ordernums = $input->param("claim_for");                                                                     # FIXME: Fallback values?
-       SendAlerts('claimacquisition',\@ordernums,$input->param("letter_code"));        # FIXME: Fallback value?
-}
-
 $template->param(ERROR_LOOP => \@errors) if (@errors);
 $template->param(
        lateorders => \@lateorders,