View | Details | Raw Unified | Return to bug 5347
Collapse All | Expand All

(-)a/C4/Letters.pm (-1 / +1 lines)
Lines 399-405 sub SendAlerts { Link Here
399
                logaction( "ACQUISITION", "CLAIM ISSUE", undef, "To=" . $mail{To} . " Title=" . $innerletter->{title} . " Content=" . $innerletter->{content} ) if $type eq 'claimissues';
399
                logaction( "ACQUISITION", "CLAIM ISSUE", undef, "To=" . $mail{To} . " Title=" . $innerletter->{title} . " Content=" . $innerletter->{content} ) if $type eq 'claimissues';
400
            }
400
            }
401
        } else {
401
        } else {
402
            die "This bookseller has no email\n";
402
            return {error => "no_email" };
403
        }
403
        }
404
404
405
        warn "sending to From $userenv->{emailaddress} subj $innerletter->{title} Mess $innerletter->{content}" if $debug;
405
        warn "sending to From $userenv->{emailaddress} subj $innerletter->{title} Mess $innerletter->{content}" if $debug;
(-)a/acqui/lateorders.pl (-1 / +4 lines)
Lines 78-89 unless ($delay =~ /^\d{1,3}$/) { Link Here
78
78
79
if ($op and $op eq "send_alert"){
79
if ($op and $op eq "send_alert"){
80
    my @ordernums = $input->param("claim_for");# FIXME: Fallback values?
80
    my @ordernums = $input->param("claim_for");# FIXME: Fallback values?
81
    my $err;
81
    eval {
82
    eval {
82
        SendAlerts( 'claimacquisition', \@ordernums, $input->param("letter_code") );    # FIXME: Fallback value?
83
        $err = SendAlerts( 'claimacquisition', \@ordernums, $input->param("letter_code") );    # FIXME: Fallback value?
83
        AddClaim ( $_ ) for @ordernums;
84
        AddClaim ( $_ ) for @ordernums;
84
    };
85
    };
85
    if ( $@ ) {
86
    if ( $@ ) {
86
        $template->param(error_claim => $@);
87
        $template->param(error_claim => $@);
88
    } elsif ( defined $err->{error} and $err->{error} eq "no_email" ) {
89
        $template->{VARS}->{'error_claim'} = "no_email";
87
    } else {
90
    } else {
88
        $template->{VARS}->{'info_claim'} = 1;
91
        $template->{VARS}->{'info_claim'} = 1;
89
    }
92
    }
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt (-3 / +5 lines)
Lines 35-41 $(document).ready(function() { Link Here
35
<div id="acqui_lateorders">
35
<div id="acqui_lateorders">
36
36
37
[% IF error_claim %]
37
[% IF error_claim %]
38
    <div class="error">[% error_claim %]</div>
38
    [% IF ( error_claim == "no_email" ) %]
39
        <div class="error">This vendor has no email</div>
40
    [% ELSE %]
41
        <div class="error">[% error_claim %]</div>
42
    [% END %]
39
[% END %]
43
[% END %]
40
[% IF info_claim %]
44
[% IF info_claim %]
41
    <div class="info">Email has been sent.</div>
45
    <div class="info">Email has been sent.</div>
Lines 62-68 $(document).ready(function() { Link Here
62
            <th>Basket</th>
66
            <th>Basket</th>
63
            <th>Claims count</th>
67
            <th>Claims count</th>
64
            <th>Claimed date</th>
68
            <th>Claimed date</th>
65
            <!-- TMPL_IF name="Supplier" -->
66
            [% IF Supplier %]
69
            [% IF Supplier %]
67
                <th><a id="CheckAll" href="#">Check all</a><br /><a id="CheckNone" href="#">Uncheck all</a></th>
70
                <th><a id="CheckAll" href="#">Check all</a><br /><a id="CheckNone" href="#">Uncheck all</a></th>
68
            [% ELSE %]
71
            [% ELSE %]
69
- 

Return to bug 5347