Bug 5347: Set translatable the "no email" error

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
This bookseller has no email shows up correctly, when vendor has
no email address.

Small change made: Changed bookseller to vendor.

diff --git a/C4/Letters.pm b/C4/Letters.pm
index 5e3089b..28c6984 100644 (file)
--- a/C4/Letters.pm
+++ b/C4/Letters.pm
@@ -399,7 +399,7 @@ sub SendAlerts {
                 logaction( "ACQUISITION", "CLAIM ISSUE", undef, "To=" . $mail{To} . " Title=" . $innerletter->{title} . " Content=" . $innerletter->{content} ) if $type eq 'claimissues';
             }
         } else {
-            die "This bookseller has no email\n";
+            return {error => "no_email" };
         }
 
         warn "sending to From $userenv->{emailaddress} subj $innerletter->{title} Mess $innerletter->{content}" if $debug;

diff --git a/acqui/lateorders.pl b/acqui/lateorders.pl
index 998899e..55031ec 100755 (executable)
--- a/acqui/lateorders.pl
+++ b/acqui/lateorders.pl
@@ -78,12 +78,15 @@ unless ($delay =~ /^\d{1,3}$/) {
 
 if ($op and $op eq "send_alert"){
     my @ordernums = $input->param("claim_for");# FIXME: Fallback values?
+    my $err;
     eval {
-        SendAlerts( 'claimacquisition', \@ordernums, $input->param("letter_code") );    # FIXME: Fallback value?
+        $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;
     }

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
index 5ce1fae..cca2d8f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
@@ -35,7 +35,11 @@ $(document).ready(function() {
 <div id="acqui_lateorders">
 
 [% IF error_claim %]
-    <div class="error">[% error_claim %]</div>
+    [% IF ( error_claim == "no_email" ) %]
+        <div class="error">This vendor has no email</div>
+    [% ELSE %]
+        <div class="error">[% error_claim %]</div>
+    [% END %]
 [% END %]
 [% IF info_claim %]
     <div class="info">Email has been sent.</div>
@@ -62,7 +66,6 @@ $(document).ready(function() {
             <th>Basket</th>
             <th>Claims count</th>
             <th>Claimed date</th>
-            <!-- TMPL_IF name="Supplier" -->
             [% IF Supplier %]
                 <th><a id="CheckAll" href="#">Check all</a><br /><a id="CheckNone" href="#">Uncheck all</a></th>
             [% ELSE %]