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

(-)a/C4/Letters.pm (-1 / +1 lines)
Lines 965-971 sub EnqueueLetter { Link Here
965
INSERT INTO message_queue
965
INSERT INTO message_queue
966
( borrowernumber, subject, content, metadata, letter_code, message_transport_type, status, time_queued, to_address, from_address, reply_address, content_type, delivery_note )
966
( borrowernumber, subject, content, metadata, letter_code, message_transport_type, status, time_queued, to_address, from_address, reply_address, content_type, delivery_note )
967
VALUES
967
VALUES
968
( ?,              ?,       ?,       ?,        ?,           ?,                      ?,      NOW(),       ?,          ?,            ?,           ?,              ? )
968
( ?,              ?,       ?,       ?,        ?,           ?,                      ?,      CAST(NOW() AS DATE),       ?,          ?,            ?,           ?,              ? )
969
ENDSQL
969
ENDSQL
970
970
971
    my $sth    = $dbh->prepare($statement);
971
    my $sth    = $dbh->prepare($statement);
(-)a/installer/data/mysql/atomicupdate/Bug-14723_-_Additional_delivery_notes_to_messages.perl (-1 / +1 lines)
Lines 1-6 Link Here
1
$DBversion = 'XXX';  # will be replaced by the RM
1
$DBversion = 'XXX';  # will be replaced by the RM
2
if( CheckVersion( $DBversion ) ) {
2
if( CheckVersion( $DBversion ) ) {
3
    $dbh->do("ALTER TABLE message_queue ADD delivery_note mediumtext");
3
    $dbh->do("ALTER TABLE message_queue ADD delivery_note mediumtext AFTER content_type");
4
4
5
    # Always end with this (adjust the bug info)
5
    # Always end with this (adjust the bug info)
6
    SetVersion( $DBversion );
6
    SetVersion( $DBversion );
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt (-2 / +11 lines)
Lines 91-97 Link Here
91
        </td>
91
        </td>
92
        <td data-order="[% QUEUED_MESSAGE.updated_on | html %]">[% QUEUED_MESSAGE.updated_on | $KohaDates  with_hours => 1 %]</td>
92
        <td data-order="[% QUEUED_MESSAGE.updated_on | html %]">[% QUEUED_MESSAGE.updated_on | $KohaDates  with_hours => 1 %]</td>
93
        <td data-order="[% QUEUED_MESSAGE.time_queued | html %]">[% QUEUED_MESSAGE.time_queued | $KohaDates  with_hours => 1 %]</td>
93
        <td data-order="[% QUEUED_MESSAGE.time_queued | html %]">[% QUEUED_MESSAGE.time_queued | $KohaDates  with_hours => 1 %]</td>
94
	    <td>[% QUEUED_MESSAGE.delivery_note | html %]</td>
94
	    <td>
95
        [% IF ( QUEUED_MESSAGE.delivery_note ) %]
96
            [% IF ( QUEUED_MESSAGE.delivery_note == "Invalid borrowernumber $borrowernumber" ) %]Invalid borrowernumber [% borrowernumber | html %]
97
            [% ELSIF ( QUEUED_MESSAGE.delivery_note == 'Unable to find an email address for this borrower' ) %]Unable to find an email address for this borrower
98
            [% ELSIF ( QUEUED_MESSAGE.delivery_note == 'Missing SMS number' ) %]Missing SMS number
99
            [% ELSIF ( QUEUED_MESSAGE.delivery_note == 'Message is duplicate' ) %]Message is duplicate
100
            [% ELSIF ( QUEUED_MESSAGE.delivery_note == 'No notes from SMS driver' ) %]No notes from SMS driver
101
            [% ELSE %]Error occured while sending email.
102
            [% END %]
103
        [% END %]
104
        </td>
95
        </tr>
105
        </tr>
96
	    [% END %]
106
	    [% END %]
97
	</tbody>
107
	</tbody>
98
- 

Return to bug 14723