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

(-)a/C4/Acquisition.pm (-18 / +20 lines)
Lines 2858-2887 sub NotifyOrderUsers { Link Here
2858
    my @borrowernumbers = GetOrderUsers($ordernumber);
2858
    my @borrowernumbers = GetOrderUsers($ordernumber);
2859
    return unless @borrowernumbers;
2859
    return unless @borrowernumbers;
2860
2860
2861
    my $order = GetOrder( $ordernumber );
2861
    my $order = GetOrder($ordernumber);
2862
    for my $borrowernumber (@borrowernumbers) {
2862
    for my $borrowernumber (@borrowernumbers) {
2863
        my $patron = Koha::Patrons->find( $borrowernumber );
2863
        my $patron  = Koha::Patrons->find($borrowernumber);
2864
        my $library = $patron->library->unblessed;
2864
        my $library = $patron->library->unblessed;
2865
        my $biblio = Koha::Biblios->find( $order->{biblionumber} )->unblessed;
2865
        my $biblio  = Koha::Biblios->find( $order->{biblionumber} )->unblessed;
2866
        my $letter = C4::Letters::GetPreparedLetter(
2866
        my $mtt     = $patron->message_transport_type_for('email');
2867
            module      => 'acquisition',
2867
        my $letter  = C4::Letters::GetPreparedLetter(
2868
            letter_code => 'ACQ_NOTIF_ON_RECEIV',
2868
            module                 => 'acquisition',
2869
            branchcode  => $library->{branchcode},
2869
            letter_code            => 'ACQ_NOTIF_ON_RECEIV',
2870
            lang        => $patron->lang,
2870
            branchcode             => $library->{branchcode},
2871
            tables      => {
2871
            message_transport_type => $mtt,
2872
                'branches'    => $library,
2872
            lang                   => $patron->lang,
2873
                'borrowers'   => $patron->unblessed,
2873
            tables                 => {
2874
                'biblio'      => $biblio,
2874
                'branches'  => $library,
2875
                'aqorders'    => $order,
2875
                'borrowers' => $patron->unblessed,
2876
                'biblio'    => $biblio,
2877
                'aqorders'  => $order,
2876
            },
2878
            },
2877
        );
2879
        );
2878
        if ( $letter ) {
2880
        if ($letter) {
2879
            C4::Letters::EnqueueLetter(
2881
            C4::Letters::EnqueueLetter(
2880
                {
2882
                {
2881
                    letter         => $letter,
2883
                    letter                 => $letter,
2882
                    borrowernumber => $borrowernumber,
2884
                    borrowernumber         => $borrowernumber,
2883
                    LibraryName    => C4::Context->preference("LibraryName"),
2885
                    LibraryName            => C4::Context->preference("LibraryName"),
2884
                    message_transport_type => $patron->message_transport_type_for('email'),
2886
                    message_transport_type => $mtt,
2885
                }
2887
                }
2886
            ) or warn "can't enqueue letter $letter";
2888
            ) or warn "can't enqueue letter $letter";
2887
        }
2889
        }
(-)a/circ/pendingreserves.pl (-10 / +13 lines)
Lines 67-78 if ( $op eq 'cud-cancel_reserve' and $reserve_id ) { Link Here
67
        C4::Circulation::LostItem( $item->itemnumber, "pendingreserves" );
67
        C4::Circulation::LostItem( $item->itemnumber, "pendingreserves" );
68
        if ( $op eq 'cud-mark_as_lost_and_notify' and C4::Context->preference('CanMarkHoldsToPullAsLost') eq 'allow_and_notify' ) {
68
        if ( $op eq 'cud-mark_as_lost_and_notify' and C4::Context->preference('CanMarkHoldsToPullAsLost') eq 'allow_and_notify' ) {
69
            my $library = $hold->branch;
69
            my $library = $hold->branch;
70
            my $letter = C4::Letters::GetPreparedLetter(
70
            my $mtt     = $patron->message_transport_type_for('email');
71
                module => 'reserves',
71
            my $letter  = C4::Letters::GetPreparedLetter(
72
                letter_code => 'CANCEL_HOLD_ON_LOST',
72
                module                 => 'reserves',
73
                branchcode => $patron->branchcode,
73
                letter_code            => 'CANCEL_HOLD_ON_LOST',
74
                lang => $patron->lang,
74
                branchcode             => $patron->branchcode,
75
                tables => {
75
                message_transport_type => $mtt,
76
                lang                   => $patron->lang,
77
                tables                 => {
76
                    branches    => $library->branchcode,
78
                    branches    => $library->branchcode,
77
                    borrowers   => $patron->borrowernumber,
79
                    borrowers   => $patron->borrowernumber,
78
                    items       => $item->itemnumber,
80
                    items       => $item->itemnumber,
Lines 81-98 if ( $op eq 'cud-cancel_reserve' and $reserve_id ) { Link Here
81
                    reserves    => $hold->unblessed,
83
                    reserves    => $hold->unblessed,
82
                },
84
                },
83
            );
85
            );
84
            if ( $letter ) {
86
            if ($letter) {
85
                my $from_address = $library->from_email_address;
87
                my $from_address = $library->from_email_address;
86
88
87
                C4::Letters::EnqueueLetter(
89
                C4::Letters::EnqueueLetter(
88
                    {   letter                 => $letter,
90
                    {
91
                        letter                 => $letter,
89
                        borrowernumber         => $patron->borrowernumber,
92
                        borrowernumber         => $patron->borrowernumber,
90
                        message_transport_type => $patron->message_transport_type_for('email'),
93
                        message_transport_type => $mtt,
91
                        from_address           => $from_address,
94
                        from_address           => $from_address,
92
                    }
95
                    }
93
                );
96
                );
94
                unless ( $patron->notice_email_address ) {
97
                unless ( $patron->notice_email_address ) {
95
                    push @messages, {type => 'alert', code => 'no_email_address', };
98
                    push @messages, { type => 'alert', code => 'no_email_address', };
96
                }
99
                }
97
                push @messages, { type => 'message', code => 'letter_enqueued' };
100
                push @messages, { type => 'message', code => 'letter_enqueued' };
98
            } else {
101
            } else {
(-)a/misc/cronjobs/membership_expiry.pl (-6 / +8 lines)
Lines 288-299 while ( my $recent = $upcoming_mem_expires->next ) { Link Here
288
        next;
288
        next;
289
    }
289
    }
290
290
291
    C4::Letters::EnqueueLetter({
291
    C4::Letters::EnqueueLetter(
292
        letter                 => $letter,
292
        {
293
        borrowernumber         => $recent->borrowernumber,
293
            letter                 => $letter,
294
        from_address           => $from_address,
294
            borrowernumber         => $recent->borrowernumber,
295
        message_transport_type => $recent->message_transport_type_for('email'),
295
            from_address           => $from_address,
296
    });
296
            message_transport_type => 'email',
297
        }
298
    );
297
    $count_enqueued++;
299
    $count_enqueued++;
298
300
299
    if ($recent->smsalertnumber) {
301
    if ($recent->smsalertnumber) {
(-)a/opac/opac-shareshelf.pl (-9 / +10 lines)
Lines 190-202 sub notify_owner { Link Here
190
    my $toaddr = $patron->notice_email_address or return;
190
    my $toaddr = $patron->notice_email_address or return;
191
191
192
    #prepare letter
192
    #prepare letter
193
    my $mtt    = $patron->message_transport_type_for('email');
193
    my $letter = C4::Letters::GetPreparedLetter(
194
    my $letter = C4::Letters::GetPreparedLetter(
194
        module      => 'members',
195
        module                 => 'members',
195
        letter_code => 'SHARE_ACCEPT',
196
        letter_code            => 'SHARE_ACCEPT',
196
        branchcode  => C4::Context->userenv->{"branch"},
197
        branchcode             => C4::Context->userenv->{"branch"},
197
        lang        => $patron->lang,
198
        message_transport_type => $mtt,
198
        tables      => { borrowers => $loggedinuser, },
199
        lang                   => $patron->lang,
199
        substitute  => { listname => $param->{shelfname}, },
200
        tables                 => { borrowers => $loggedinuser, },
201
        substitute             => { listname  => $param->{shelfname}, },
200
    );
202
    );
201
203
202
    #send letter to queue
204
    #send letter to queue
Lines 204-211 sub notify_owner { Link Here
204
        {
206
        {
205
            letter                 => $letter,
207
            letter                 => $letter,
206
            message_transport_type => 'email',
208
            message_transport_type => 'email',
207
            from_address => C4::Context->preference('KohaAdminEmailAddress'),
209
            from_address           => C4::Context->preference('KohaAdminEmailAddress'),
208
            message_transport_type => $patron->message_transport_type_for('email'),
210
            message_transport_type => $mtt,
209
        }
211
        }
210
    );
212
    );
211
}
213
}
212
- 

Return to bug 21781