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

(-)a/C4/Letters.pm (-5 / +10 lines)
Lines 1330-1336 sub _send_message_by_email { Link Here
1330
            warn "FAIL: No 'to_address' and INVALID borrowernumber ($message->{borrowernumber})";
1330
            warn "FAIL: No 'to_address' and INVALID borrowernumber ($message->{borrowernumber})";
1331
            _set_message_status( { message_id => $message->{'message_id'},
1331
            _set_message_status( { message_id => $message->{'message_id'},
1332
                                   status     => 'failed',
1332
                                   status     => 'failed',
1333
                                   delivery_note => 'Invalid borrowernumber '.$message->{borrowernumber} } );
1333
                                   delivery_note => 'Invalid borrowernumber '.$message->{borrowernumber}, 
1334
                                   error_code => 'INVALID_BORNUMBER' } );
1334
            return;
1335
            return;
1335
        }
1336
        }
1336
        $to_address = $patron->notice_email_address;
1337
        $to_address = $patron->notice_email_address;
Lines 1339-1345 sub _send_message_by_email { Link Here
1339
            # warning too verbose for this more common case?
1340
            # warning too verbose for this more common case?
1340
            _set_message_status( { message_id => $message->{'message_id'},
1341
            _set_message_status( { message_id => $message->{'message_id'},
1341
                                   status     => 'failed',
1342
                                   status     => 'failed',
1342
                                   delivery_note => 'Unable to find an email address for this borrower' } );
1343
                                   delivery_note => 'Unable to find an email address for this borrower', 
1344
                                   error_code => 'NO_EMAIL' } );
1343
            return;
1345
            return;
1344
        }
1346
        }
1345
    }
1347
    }
Lines 1478-1491 sub _send_message_by_sms { Link Here
1478
    unless ( $patron and $patron->smsalertnumber ) {
1480
    unless ( $patron and $patron->smsalertnumber ) {
1479
        _set_message_status( { message_id => $message->{'message_id'},
1481
        _set_message_status( { message_id => $message->{'message_id'},
1480
                               status     => 'failed',
1482
                               status     => 'failed',
1481
                               delivery_note => 'Missing SMS number' } );
1483
                               delivery_note => 'Missing SMS number',
1484
                               error_code => 'MISSING_SMS' } );
1482
        return;
1485
        return;
1483
    }
1486
    }
1484
1487
1485
    if ( _is_duplicate( $message ) ) {
1488
    if ( _is_duplicate( $message ) ) {
1486
        _set_message_status( { message_id => $message->{'message_id'},
1489
        _set_message_status( { message_id => $message->{'message_id'},
1487
                               status     => 'failed',
1490
                               status     => 'failed',
1488
                               delivery_note => 'Message is duplicate' } );
1491
                               delivery_note => 'Message is duplicate', 
1492
                               error_code => 'DUPLICATE_MESSAGE' } );
1489
        return;
1493
        return;
1490
    }
1494
    }
1491
1495
Lines 1494-1500 sub _send_message_by_sms { Link Here
1494
                                     } );
1498
                                     } );
1495
    _set_message_status( { message_id => $message->{'message_id'},
1499
    _set_message_status( { message_id => $message->{'message_id'},
1496
                           status     => ($success ? 'sent' : 'failed'),
1500
                           status     => ($success ? 'sent' : 'failed'),
1497
                           delivery_note => ($success ? '' : 'No notes from SMS driver') } );
1501
                           delivery_note => ($success ? '' : 'No notes from SMS driver'),
1502
                           error_code => 'NO_NOTES' } );
1498
1503
1499
    return $success;
1504
    return $success;
1500
}
1505
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt (-7 / +6 lines)
Lines 91-102 Link Here
91
        <td data-order="[% QUEUED_MESSAGE.updated_on | html %]">[% QUEUED_MESSAGE.updated_on | $KohaDates  with_hours => 1 %]</td>
91
        <td data-order="[% QUEUED_MESSAGE.updated_on | html %]">[% QUEUED_MESSAGE.updated_on | $KohaDates  with_hours => 1 %]</td>
92
        <td data-order="[% QUEUED_MESSAGE.time_queued | html %]">[% QUEUED_MESSAGE.time_queued | $KohaDates  with_hours => 1 %]</td>
92
        <td data-order="[% QUEUED_MESSAGE.time_queued | html %]">[% QUEUED_MESSAGE.time_queued | $KohaDates  with_hours => 1 %]</td>
93
        <td>
93
        <td>
94
        [% IF ( QUEUED_MESSAGE.delivery_note ) %]
94
        [% IF ( QUEUED_MESSAGE.error_code ) %]
95
            [% IF ( QUEUED_MESSAGE.delivery_note == "Invalid borrowernumber $borrowernumber" ) %]Invalid borrowernumber [% borrowernumber | html %]
95
            [% IF ( QUEUED_MESSAGE.error_code == "INVALID_BORNUMBER" ) %]Invalid borrowernumber [% borrowernumber | html %]
96
            [% ELSIF ( QUEUED_MESSAGE.delivery_note == 'Unable to find an email address for this borrower' ) %]Unable to find an email address for this borrower
96
            [% ELSIF ( QUEUED_MESSAGE.error_code == 'NO_EMAIL' ) %]Unable to find an email address for this borrower
97
            [% ELSIF ( QUEUED_MESSAGE.delivery_note == 'Missing SMS number' ) %]Missing SMS number
97
            [% ELSIF ( QUEUED_MESSAGE.error_code == 'MISSING_SMS' ) %]Missing SMS number
98
            [% ELSIF ( QUEUED_MESSAGE.delivery_note == 'Message is duplicate' ) %]Message is duplicate
98
            [% ELSIF ( QUEUED_MESSAGE.error_code == 'DUPLICATE_MESSAGE' ) %]Message is duplicate
99
            [% ELSIF ( QUEUED_MESSAGE.delivery_note == 'No notes from SMS driver' ) %]No notes from SMS driver
99
            [% ELSIF ( QUEUED_MESSAGE.error_code == 'NO_NOTES' ) %]No notes from SMS driver
100
            [% ELSE %]Error occured while sending email.
100
            [% ELSE %]Error occured while sending email.
101
            [% END %]
101
            [% END %]
102
        [% END %]
102
        [% END %]
103
- 

Return to bug 14723