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

(-)a/C4/Letters.pm (-4 / +31 lines)
Lines 1527-1532 sub _send_message_by_email { Link Here
1527
        );
1527
        );
1528
        return;
1528
        return;
1529
    }
1529
    }
1530
1531
    my $bcc_address = C4::Context->preference('NoticeBcc');
1532
1533
    if (    C4::Context->preference('EmailFieldPrimary') eq "MULTI"
1534
        and C4::Context->preference('EmailRecipientField') eq "cc" )
1535
    {
1536
        $cc_address = $cc_address ? join( ',', $cc_address, $to_address ) : $to_address;
1537
        _update_message_cc_address( $message->{'message_id'}, $cc_address );
1538
        if ($count_guarantor_address) {
1539
            $to_address = shift @guarantor_address;
1540
        } else {
1541
            my @to_address = split( ',', $to_address );
1542
            $to_address = shift @to_address;
1543
        }
1544
        _update_message_to_address( $message->{'message_id'}, $to_address );
1545
    } elsif ( C4::Context->preference('EmailFieldPrimary') eq "MULTI"
1546
        and C4::Context->preference('EmailRecipientField') eq "bcc" )
1547
    {
1548
        $bcc_address = $bcc_address ? join( ',', $bcc_address, $to_address ) : $to_address;
1549
        if ($count_guarantor_address) {
1550
            $to_address = shift @guarantor_address;
1551
        } else {
1552
            my @to_address = split( ',', $to_address );
1553
            $to_address = shift @to_address;
1554
        }
1555
        _update_message_to_address( $message->{'message_id'}, $to_address );
1556
    }
1557
1530
    my $email;
1558
    my $email;
1531
1559
1532
    try {
1560
    try {
Lines 1534-1541 sub _send_message_by_email { Link Here
1534
        my $params = {
1562
        my $params = {
1535
            to => $to_address,
1563
            to => $to_address,
1536
            (
1564
            (
1537
                C4::Context->preference('NoticeBcc')
1565
                $bcc_address
1538
                ? ( bcc => C4::Context->preference('NoticeBcc') )
1566
                ? ( bcc => $bcc_address )
1539
                : ()
1567
                : ()
1540
            ),
1568
            ),
1541
            (
1569
            (
Lines 1552-1558 sub _send_message_by_email { Link Here
1552
                ? ( template_id => $message->{letter_id} )
1580
                ? ( template_id => $message->{letter_id} )
1553
                : ()
1581
                : ()
1554
            ),
1582
            ),
1555
            message_id => $message->{id}
1583
            message_id => $message->{message_id}
1556
        };
1584
        };
1557
1585
1558
        if ( $message->{'content_type'} && $message->{'content_type'} eq SERIALIZED_EMAIL_CONTENT_TYPE ) {
1586
        if ( $message->{'content_type'} && $message->{'content_type'} eq SERIALIZED_EMAIL_CONTENT_TYPE ) {
1559
- 

Return to bug 37598