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

(-)a/C4/Letters.pm (-1 / +1 lines)
Lines 961-967 sub EnqueueLetter { Link Here
961 
INSERT INTO message_queue
 961 
INSERT INTO message_queue
962 
( borrowernumber, subject, content, metadata, letter_code, message_transport_type, status, time_queued, to_address, from_address, reply_address, content_type, delivery_note )
 962 
( borrowernumber, subject, content, metadata, letter_code, message_transport_type, status, time_queued, to_address, from_address, reply_address, content_type, delivery_note )
963 
VALUES
 963 
VALUES
964 
( ?,              ?,       ?,       ?,        ?,           ?,                      ?,      NOW(),       ?,          ?,            ?,           ?,              ? )
 964 
( ?,              ?,       ?,       ?,        ?,           ?,                      ?,      CAST(NOW() AS DATE),       ?,          ?,            ?,           ?,              ? )
965 
ENDSQL
 965 
ENDSQL
966 

          966
          

        

        

          967
          
    my $sth    = $dbh->prepare($statement);

          967
          
    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 77-83
          
      
      
        Link Here
      
    
  

        

          77
          
        </td>

          77
          
        </td>

        

        

          78
          
        <td><span title="[% QUEUED_MESSAGE.updated_on | html %]">[% QUEUED_MESSAGE.updated_on | $KohaDates  with_hours => 1 %]</span></td>

          78
          
        <td><span title="[% QUEUED_MESSAGE.updated_on | html %]">[% QUEUED_MESSAGE.updated_on | $KohaDates  with_hours => 1 %]</span></td>

        

        

          79
          
        <td><span title="[% QUEUED_MESSAGE.time_queued | html %]">[% QUEUED_MESSAGE.time_queued | $KohaDates  with_hours => 1 %]</span></td>

          79
          
        <td><span title="[% QUEUED_MESSAGE.time_queued | html %]">[% QUEUED_MESSAGE.time_queued | $KohaDates  with_hours => 1 %]</span></td>

        

          
            

              80
              
        <td>[% QUEUED_MESSAGE.delivery_note | html %]</td>


              80
              
        <td>

            

            

              
              

              81
              
        [% IF ( QUEUED_MESSAGE.delivery_note ) %]

            

            


              82
              
            [% IF ( QUEUED_MESSAGE.delivery_note == "Invalid borrowernumber $borrowernumber" ) %]Invalid borrowernumber [% borrowernumber | html %]

            

            


              83
              
            [% ELSIF ( QUEUED_MESSAGE.delivery_note == 'Unable to find an email address for this borrower' ) %]Unable to find an email address for this borrower

            

            


              84
              
            [% ELSIF ( QUEUED_MESSAGE.delivery_note == 'Missing SMS number' ) %]Missing SMS number

            

            


              85
              
            [% ELSIF ( QUEUED_MESSAGE.delivery_note == 'Message is duplicate' ) %]Message is duplicate

            

            


              86
              
            [% ELSIF ( QUEUED_MESSAGE.delivery_note == 'No notes from SMS driver' ) %]No notes from SMS driver

            

            


              87
              
            [% ELSE %]Error occured while sending email.

            

            


              88
              
            [% END %]

            

            


              89
              
        [% END %]

            

            


              90
              
        </td>

            

        

          81
          
	    </tr>

          91
          
	    </tr>

        

        

          82
          
	    [% END %]

          92
          
	    [% END %]

        

        

          83
          
	</tbody>

          93
          
	</tbody>

        

            

              84
              
- 

              
              
            






  

  Return to bug 14723