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

(-)a/C4/Letters.pm (-3 / +12 lines)
Lines 1038-1044 Returns number of messages sent. Link Here
1038
sub SendQueuedMessages {
1038
sub SendQueuedMessages {
1039
    my $params = shift;
1039
    my $params = shift;
1040
1040
1041
    my $unsent_messages = _get_unsent_messages( { limit => $params->{limit} } );
1041
    my $which_unsent_messages  = {
1042
        'limit'          => $params->{'limit'} // 0,
1043
        'borrowernumber' => $params->{'borrowernumber'} // q{},
1044
        'letter_code'    => $params->{'letter_code'} // q{},
1045
    };
1046
    my $unsent_messages = _get_unsent_messages( $which_unsent_messages );
1042
    MESSAGE: foreach my $message ( @$unsent_messages ) {
1047
    MESSAGE: foreach my $message ( @$unsent_messages ) {
1043
        # warn Data::Dumper->Dump( [ $message ], [ 'message' ] );
1048
        # warn Data::Dumper->Dump( [ $message ], [ 'message' ] );
1044
        warn sprintf( 'sending %s message to patron: %s',
1049
        warn sprintf( 'sending %s message to patron: %s',
Lines 1282-1294 sub _get_unsent_messages { Link Here
1282
    my @query_params = ('pending');
1287
    my @query_params = ('pending');
1283
    if ( ref $params ) {
1288
    if ( ref $params ) {
1284
        if ( $params->{'message_transport_type'} ) {
1289
        if ( $params->{'message_transport_type'} ) {
1285
            $statement .= ' AND message_transport_type = ? ';
1290
            $statement .= ' AND mq.message_transport_type = ? ';
1286
            push @query_params, $params->{'message_transport_type'};
1291
            push @query_params, $params->{'message_transport_type'};
1287
        }
1292
        }
1288
        if ( $params->{'borrowernumber'} ) {
1293
        if ( $params->{'borrowernumber'} ) {
1289
            $statement .= ' AND borrowernumber = ? ';
1294
            $statement .= ' AND mq.borrowernumber = ? ';
1290
            push @query_params, $params->{'borrowernumber'};
1295
            push @query_params, $params->{'borrowernumber'};
1291
        }
1296
        }
1297
        if ( $params->{'letter_code'} ) {
1298
            $statement .= ' AND mq.letter_code = ? ';
1299
            push @query_params, $params->{'letter_code'};
1300
        }
1292
        if ( $params->{'limit'} ) {
1301
        if ( $params->{'limit'} ) {
1293
            $statement .= ' limit ? ';
1302
            $statement .= ' limit ? ';
1294
            push @query_params, $params->{'limit'};
1303
            push @query_params, $params->{'limit'};
(-)a/Koha/Patron/Password/Recovery.pm (-3 / +5 lines)
Lines 161-168 sub SendPasswordRecoveryEmail { Link Here
161
            message_transport_type => 'email',
161
            message_transport_type => 'email',
162
        }
162
        }
163
    );
163
    );
164
164
    my $num_letters_attempted = C4::Letters::SendQueuedMessages( {
165
    return 1;
165
        borrowernumber => $borrower->borrowernumber,
166
        letter_code => 'PASSWORD_RESET'
167
    } );
168
    return ($num_letters_attempted > 0);
166
}
169
}
167
170
168
=head2 CompletePasswordRecovery
171
=head2 CompletePasswordRecovery
169
- 

Return to bug 18570