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

(-)a/C4/Acquisition.pm (-6 / +8 lines)
Lines 2933-2944 sub NotifyOrderUsers { Link Here
2933
        my $patron  = Koha::Patrons->find($borrowernumber);
2933
        my $patron  = Koha::Patrons->find($borrowernumber);
2934
        my $library = $patron->library->unblessed;
2934
        my $library = $patron->library->unblessed;
2935
        my $biblio  = Koha::Biblios->find( $order->{biblionumber} )->unblessed;
2935
        my $biblio  = Koha::Biblios->find( $order->{biblionumber} )->unblessed;
2936
        my $mtt     = $patron->message_transport_type_for('email');
2936
        my $letter  = C4::Letters::GetPreparedLetter(
2937
        my $letter  = C4::Letters::GetPreparedLetter(
2937
            module      => 'acquisition',
2938
            module                 => 'acquisition',
2938
            letter_code => 'ACQ_NOTIF_ON_RECEIV',
2939
            letter_code            => 'ACQ_NOTIF_ON_RECEIV',
2939
            branchcode  => $library->{branchcode},
2940
            branchcode             => $library->{branchcode},
2940
            lang        => $patron->lang,
2941
            message_transport_type => $mtt,
2941
            tables      => {
2942
            lang                   => $patron->lang,
2943
            tables                 => {
2942
                'branches'  => $library,
2944
                'branches'  => $library,
2943
                'borrowers' => $patron->unblessed,
2945
                'borrowers' => $patron->unblessed,
2944
                'biblio'    => $biblio,
2946
                'biblio'    => $biblio,
Lines 2951-2957 sub NotifyOrderUsers { Link Here
2951
                    letter                 => $letter,
2953
                    letter                 => $letter,
2952
                    borrowernumber         => $borrowernumber,
2954
                    borrowernumber         => $borrowernumber,
2953
                    LibraryName            => C4::Context->preference("LibraryName"),
2955
                    LibraryName            => C4::Context->preference("LibraryName"),
2954
                    message_transport_type => $patron->message_transport_type_for('email'),
2956
                    message_transport_type => $mtt,
2955
                }
2957
                }
2956
            ) or warn "can't enqueue letter $letter";
2958
            ) or warn "can't enqueue letter $letter";
2957
        }
2959
        }
(-)a/circ/pendingreserves.pl (-6 / +8 lines)
Lines 69-80 if ( $op eq 'cud-cancel_reserve' and $reserve_id ) { Link Here
69
            and C4::Context->preference('CanMarkHoldsToPullAsLost') eq 'allow_and_notify' )
69
            and C4::Context->preference('CanMarkHoldsToPullAsLost') eq 'allow_and_notify' )
70
        {
70
        {
71
            my $library = $hold->branch;
71
            my $library = $hold->branch;
72
            my $mtt     = $patron->message_transport_type_for('email');
72
            my $letter  = C4::Letters::GetPreparedLetter(
73
            my $letter  = C4::Letters::GetPreparedLetter(
73
                module      => 'reserves',
74
                module                 => 'reserves',
74
                letter_code => 'CANCEL_HOLD_ON_LOST',
75
                letter_code            => 'CANCEL_HOLD_ON_LOST',
75
                branchcode  => $patron->branchcode,
76
                branchcode             => $patron->branchcode,
76
                lang        => $patron->lang,
77
                message_transport_type => $mtt,
77
                tables      => {
78
                lang                   => $patron->lang,
79
                tables                 => {
78
                    branches    => $library->branchcode,
80
                    branches    => $library->branchcode,
79
                    borrowers   => $patron->borrowernumber,
81
                    borrowers   => $patron->borrowernumber,
80
                    items       => $item->itemnumber,
82
                    items       => $item->itemnumber,
Lines 90-96 if ( $op eq 'cud-cancel_reserve' and $reserve_id ) { Link Here
90
                    {
92
                    {
91
                        letter                 => $letter,
93
                        letter                 => $letter,
92
                        borrowernumber         => $patron->borrowernumber,
94
                        borrowernumber         => $patron->borrowernumber,
93
                        message_transport_type => $patron->message_transport_type_for('email'),
95
                        message_transport_type => $mtt,
94
                        from_address           => $from_address,
96
                        from_address           => $from_address,
95
                    }
97
                    }
96
                );
98
                );
(-)a/opac/opac-shareshelf.pl (-11 / +9 lines)
Lines 192-216 sub notify_owner { Link Here
192
    my $patron = Koha::Patrons->find( $param->{owner} );
192
    my $patron = Koha::Patrons->find( $param->{owner} );
193
    return unless $patron;
193
    return unless $patron;
194
194
195
    my $toaddr = $patron->notice_email_address or return;
196
197
    #prepare letter
195
    #prepare letter
196
    my $mtt    = $patron->message_transport_type_for('email');
198
    my $letter = C4::Letters::GetPreparedLetter(
197
    my $letter = C4::Letters::GetPreparedLetter(
199
        module      => 'lists',
198
        module                 => 'lists',
200
        letter_code => 'SHARE_ACCEPT',
199
        letter_code            => 'SHARE_ACCEPT',
201
        branchcode  => C4::Context->userenv->{"branch"},
200
        branchcode             => C4::Context->userenv->{"branch"},
202
        lang        => $patron->lang,
201
        message_transport_type => $mtt,
203
        tables      => { borrowers => $loggedinuser, },
202
        lang                   => $patron->lang,
204
        substitute  => { listname  => $param->{shelfname}, },
203
        tables                 => { borrowers => $loggedinuser, },
204
        substitute             => { listname  => $param->{shelfname}, },
205
    );
205
    );
206
206
207
    #send letter to queue
207
    #send letter to queue
208
    C4::Letters::EnqueueLetter(
208
    C4::Letters::EnqueueLetter(
209
        {
209
        {
210
            letter                 => $letter,
210
            letter                 => $letter,
211
            message_transport_type => 'email',
211
            message_transport_type => $mtt,
212
            from_address           => C4::Context->preference('KohaAdminEmailAddress'),
212
            from_address           => C4::Context->preference('KohaAdminEmailAddress'),
213
            message_transport_type => $patron->message_transport_type_for('email'),
214
        }
213
        }
215
    );
214
    );
216
}
215
}
217
- 

Return to bug 21781