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

(-)a/C4/Letters.pm (-4 / +31 lines)
Lines 1451-1456 sub _send_message_by_email { Link Here
1451
        );
1451
        );
1452
        return;
1452
        return;
1453
    };
1453
    };
1454
1455
    my $bcc_address = C4::Context->preference('NoticeBcc');
1456
1457
    if (    C4::Context->preference('EmailFieldPrimary') eq "MULTI"
1458
        and C4::Context->preference('EmailRecipientField') eq "cc" )
1459
    {
1460
        $cc_address = $cc_address ? join( ',', $cc_address, $to_address ) : $to_address;
1461
        _update_message_cc_address( $message->{'message_id'}, $cc_address );
1462
        if ($count_guarantor_address) {
1463
            $to_address = shift @guarantor_address;
1464
        } else {
1465
            my @to_address = split( ',', $to_address );
1466
            $to_address = shift @to_address;
1467
        }
1468
        _update_message_to_address( $message->{'message_id'}, $to_address );
1469
    } elsif ( C4::Context->preference('EmailFieldPrimary') eq "MULTI"
1470
        and C4::Context->preference('EmailRecipientField') eq "bcc" )
1471
    {
1472
        $bcc_address = $bcc_address ? join( ',', $bcc_address, $to_address ) : $to_address;
1473
        if ($count_guarantor_address) {
1474
            $to_address = shift @guarantor_address;
1475
        } else {
1476
            my @to_address = split( ',', $to_address );
1477
            $to_address = shift @to_address;
1478
        }
1479
        _update_message_to_address( $message->{'message_id'}, $to_address );
1480
    }
1481
1454
    my $email;
1482
    my $email;
1455
1483
1456
    try {
1484
    try {
Lines 1458-1465 sub _send_message_by_email { Link Here
1458
        my $params = {
1486
        my $params = {
1459
            to => $to_address,
1487
            to => $to_address,
1460
            (
1488
            (
1461
                C4::Context->preference('NoticeBcc')
1489
                $bcc_address
1462
                ? ( bcc => C4::Context->preference('NoticeBcc') )
1490
                ? ( bcc => $bcc_address )
1463
                : ()
1491
                : ()
1464
            ),
1492
            ),
1465
            (
1493
            (
Lines 1476-1482 sub _send_message_by_email { Link Here
1476
                ? ( template_id => $message->{letter_id} )
1504
                ? ( template_id => $message->{letter_id} )
1477
                : ()
1505
                : ()
1478
            ),
1506
            ),
1479
            message_id => $message->{id}
1507
            message_id => $message->{message_id}
1480
        };
1508
        };
1481
1509
1482
        if ( $message->{'content_type'} && $message->{'content_type'} eq SERIALIZED_EMAIL_CONTENT_TYPE ) {
1510
        if ( $message->{'content_type'} && $message->{'content_type'} eq SERIALIZED_EMAIL_CONTENT_TYPE ) {
1483
- 

Return to bug 37598