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

(-)a/C4/Letters.pm (-3 / +8 lines)
Lines 36-41 use Koha::DateUtils; Link Here
36
use Koha::SMS::Providers;
36
use Koha::SMS::Providers;
37
37
38
use Koha::Email;
38
use Koha::Email;
39
use Koha::Notice::Messages;
39
use Koha::DateUtils qw( format_sqldatetime dt_from_string );
40
use Koha::DateUtils qw( format_sqldatetime dt_from_string );
40
use Koha::Patrons;
41
use Koha::Patrons;
41
42
Lines 1037-1042 sub SendQueuedMessages { Link Here
1037
1038
1038
    my $unsent_messages = _get_unsent_messages( { limit => $params->{limit} } );
1039
    my $unsent_messages = _get_unsent_messages( { limit => $params->{limit} } );
1039
    MESSAGE: foreach my $message ( @$unsent_messages ) {
1040
    MESSAGE: foreach my $message ( @$unsent_messages ) {
1041
        my $message_object = Koha::Notice::Messages->find( $message->{message_id} );
1042
        $message_object->status('processing');
1043
        # If this fails the database is unwritable and we won't manage to send a message that continues to be marked 'pending'
1044
        return unless $message_object->store();
1045
1040
        # warn Data::Dumper->Dump( [ $message ], [ 'message' ] );
1046
        # warn Data::Dumper->Dump( [ $message ], [ 'message' ] );
1041
        warn sprintf( 'sending %s message to patron: %s',
1047
        warn sprintf( 'sending %s message to patron: %s',
1042
                      $message->{'message_transport_type'},
1048
                      $message->{'message_transport_type'},
Lines 1053-1063 sub SendQueuedMessages { Link Here
1053
                my $sms_provider = Koha::SMS::Providers->find( $patron->sms_provider_id );
1059
                my $sms_provider = Koha::SMS::Providers->find( $patron->sms_provider_id );
1054
                unless ( $sms_provider ) {
1060
                unless ( $sms_provider ) {
1055
                    warn sprintf( "Patron %s has no sms provider id set!", $message->{'borrowernumber'} ) if $params->{'verbose'} or $debug;
1061
                    warn sprintf( "Patron %s has no sms provider id set!", $message->{'borrowernumber'} ) if $params->{'verbose'} or $debug;
1056
                    _set_message_status( { message_id => $message->{'message_id'}, status => 'failed' } );
1062
                    # message has already been set to failed 
1057
                    next MESSAGE;
1063
                    next MESSAGE;
1058
                }
1064
                }
1059
                unless ( $patron->smsalertnumber ) {
1065
                unless ( $patron->smsalertnumber ) {
1060
                    _set_message_status( { message_id => $message->{'message_id'}, status => 'failed' } );
1066
                    # message has already been set to failed, nothing to update
1061
                    warn sprintf( "No smsalertnumber found for patron %s!", $message->{'borrowernumber'} ) if $params->{'verbose'} or $debug;
1067
                    warn sprintf( "No smsalertnumber found for patron %s!", $message->{'borrowernumber'} ) if $params->{'verbose'} or $debug;
1062
                    next MESSAGE;
1068
                    next MESSAGE;
1063
                }
1069
                }
1064
- 

Return to bug 18725