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

(-)a/C4/Letters.pm (-1 / +15 lines)
Lines 993-999 sub SendQueuedMessages { Link Here
993
                }
993
                }
994
                $message->{to_address}  = $patron->smsalertnumber; #Sometime this is set to email - sms should always use smsalertnumber
994
                $message->{to_address}  = $patron->smsalertnumber; #Sometime this is set to email - sms should always use smsalertnumber
995
                $message->{to_address} .= '@' . $sms_provider->domain();
995
                $message->{to_address} .= '@' . $sms_provider->domain();
996
                _update_message_to_address($message->{'message_id'},$message->{to_address});
996
997
                # Check for possible from_address override
998
                my $from_address = C4::Context->preference('EmailSMSSendDriverFromAddress');
999
                if ($from_address && $message->{from_address} ne $from_address) {
1000
                    $message->{from_address} = $from_address;
1001
                    _update_message_from_address($message->{'message_id'}, $message->{from_address});
1002
                }
1003
1004
                _update_message_to_address($message->{'message_id'}, $message->{to_address});
997
                _send_message_by_email( $message, $params->{'username'}, $params->{'password'}, $params->{'method'} );
1005
                _send_message_by_email( $message, $params->{'username'}, $params->{'password'}, $params->{'method'} );
998
            } else {
1006
            } else {
999
                _send_message_by_sms( $message );
1007
                _send_message_by_sms( $message );
Lines 1388-1393 sub _update_message_to_address { Link Here
1388
    $dbh->do('UPDATE message_queue SET to_address=? WHERE message_id=?',undef,($to,$id));
1396
    $dbh->do('UPDATE message_queue SET to_address=? WHERE message_id=?',undef,($to,$id));
1389
}
1397
}
1390
1398
1399
sub _update_message_from_address {
1400
    my ($message_id, $from_address) = @_;
1401
    my $dbh = C4::Context->dbh();
1402
    $dbh->do('UPDATE message_queue SET from_address = ? WHERE message_id = ?', undef, ($from_address, $message_id));
1403
}
1404
1391
sub _set_message_status {
1405
sub _set_message_status {
1392
    my $params = shift or return;
1406
    my $params = shift or return;
1393
1407
(-)a/installer/data/mysql/atomicupdate/bug_20356-add-syspref-EmailSMSSendDriverFromAddress.sql (+1 lines)
Line 0 Link Here
1
INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type`) VALUES  ('EmailSMSSendDriverFromAddress', '', '', 'Email SMS send driver from address override', 'Free');
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref (+3 lines)
Lines 136-141 Patrons: Link Here
136
         - pref: SMSSendUsername
136
         - pref: SMSSendUsername
137
         - "and a password"
137
         - "and a password"
138
         - pref: SMSSendPassword
138
         - pref: SMSSendPassword
139
         - ". Override from address with"
140
         - pref: EmailSMSSendDriverFromAddress
141
         - "for emails sent using \"Email\" send driver."
139
     -
142
     -
140
         - pref: uppercasesurnames
143
         - pref: uppercasesurnames
141
           choices:
144
           choices:
(-)a/t/db_dependent/Letters.t (-6 / +34 lines)
Lines 598-605 subtest 'TranslateNotices' => sub { Link Here
598
598
599
subtest 'SendQueuedMessages' => sub {
599
subtest 'SendQueuedMessages' => sub {
600
600
601
    plan tests => 4;
601
    plan tests => 6;
602
602
    t::lib::Mocks::mock_preference( 'SMSSendDriver', 'Email' );
603
    t::lib::Mocks::mock_preference( 'SMSSendDriver', 'Email' );
604
    t::lib::Mocks::mock_preference('EmailSMSSendDriverFromAddress', '');
605
603
    my $patron = Koha::Patrons->find($borrowernumber);
606
    my $patron = Koha::Patrons->find($borrowernumber);
604
    $dbh->do(q|
607
    $dbh->do(q|
605
        INSERT INTO message_queue(borrowernumber, subject, content, message_transport_type, status, letter_code)
608
        INSERT INTO message_queue(borrowernumber, subject, content, message_transport_type, status, letter_code)
Lines 613-623 subtest 'SendQueuedMessages' => sub { Link Here
613
    $patron->set( { smsalertnumber => '5555555555', sms_provider_id => $sms_pro->id() } )->store;
616
    $patron->set( { smsalertnumber => '5555555555', sms_provider_id => $sms_pro->id() } )->store;
614
    $message_id = C4::Letters::EnqueueLetter($my_message); #using datas set around line 95 and forward
617
    $message_id = C4::Letters::EnqueueLetter($my_message); #using datas set around line 95 and forward
615
    C4::Letters::SendQueuedMessages();
618
    C4::Letters::SendQueuedMessages();
616
    my $sms_message_address = $schema->resultset('MessageQueue')->search({
619
620
    my $message = $schema->resultset('MessageQueue')->search({
617
        borrowernumber => $borrowernumber,
621
        borrowernumber => $borrowernumber,
618
        status => 'sent'
622
        status => 'sent'
619
    })->next()->to_address();
623
    })->next();
620
    is( $sms_message_address, '5555555555@kidclamp.rocks', 'SendQueuedMessages populates the to address correctly for SMS by email when to_address not set' );
624
625
    is( $message->to_address(), '5555555555@kidclamp.rocks', 'SendQueuedMessages populates the to address correctly for SMS by email when to_address not set' );
626
    is(
627
        $message->from_address(),
628
        'from@example.com',
629
        'SendQueuedMessages uses message queue item \"from address\" for SMS by email when EmailSMSSendDriverFromAddress system preference is not set'
630
    );
631
632
    $schema->resultset('MessageQueue')->search({borrowernumber => $borrowernumber, status => 'sent'})->delete(); #clear borrower queue
633
634
    t::lib::Mocks::mock_preference('EmailSMSSendDriverFromAddress', 'override@example.com');
635
636
    $message_id = C4::Letters::EnqueueLetter($my_message);
637
    C4::Letters::SendQueuedMessages();
638
639
    $message = $schema->resultset('MessageQueue')->search({
640
        borrowernumber => $borrowernumber,
641
        status => 'sent'
642
    })->next();
643
644
    is(
645
        $message->from_address(),
646
        'override@example.com',
647
        'SendQueuedMessages uses EmailSMSSendDriverFromAddress value for SMS by email when EmailSMSSendDriverFromAddress is set'
648
    );
649
621
    $schema->resultset('MessageQueue')->search({borrowernumber => $borrowernumber,status => 'sent'})->delete(); #clear borrower queue
650
    $schema->resultset('MessageQueue')->search({borrowernumber => $borrowernumber,status => 'sent'})->delete(); #clear borrower queue
622
    $my_message->{to_address} = 'fixme@kidclamp.iswrong';
651
    $my_message->{to_address} = 'fixme@kidclamp.iswrong';
623
    $message_id = C4::Letters::EnqueueLetter($my_message);
652
    $message_id = C4::Letters::EnqueueLetter($my_message);
Lines 629-635 subtest 'SendQueuedMessages' => sub { Link Here
629
    is ( $number_attempted, 0, 'There were no password reset messages for SendQueuedMessages to attempt.' );
658
    is ( $number_attempted, 0, 'There were no password reset messages for SendQueuedMessages to attempt.' );
630
659
631
    C4::Letters::SendQueuedMessages();
660
    C4::Letters::SendQueuedMessages();
632
    $sms_message_address = $schema->resultset('MessageQueue')->search({
661
    my $sms_message_address = $schema->resultset('MessageQueue')->search({
633
        borrowernumber => $borrowernumber,
662
        borrowernumber => $borrowernumber,
634
        status => 'sent'
663
        status => 'sent'
635
    })->next()->to_address();
664
    })->next()->to_address();
636
- 

Return to bug 20356