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

(-)a/C4/Acquisition.pm (-6 / +8 lines)
Lines 2915-2926 sub NotifyOrderUsers { Link Here
2915
        my $patron  = Koha::Patrons->find($borrowernumber);
2915
        my $patron  = Koha::Patrons->find($borrowernumber);
2916
        my $library = $patron->library->unblessed;
2916
        my $library = $patron->library->unblessed;
2917
        my $biblio  = Koha::Biblios->find( $order->{biblionumber} )->unblessed;
2917
        my $biblio  = Koha::Biblios->find( $order->{biblionumber} )->unblessed;
2918
        my $mtt     = $patron->message_transport_type_for('email');
2918
        my $letter  = C4::Letters::GetPreparedLetter(
2919
        my $letter  = C4::Letters::GetPreparedLetter(
2919
            module      => 'acquisition',
2920
            module                 => 'acquisition',
2920
            letter_code => 'ACQ_NOTIF_ON_RECEIV',
2921
            letter_code            => 'ACQ_NOTIF_ON_RECEIV',
2921
            branchcode  => $library->{branchcode},
2922
            branchcode             => $library->{branchcode},
2922
            lang        => $patron->lang,
2923
            message_transport_type => $mtt,
2923
            tables      => {
2924
            lang                   => $patron->lang,
2925
            tables                 => {
2924
                'branches'  => $library,
2926
                'branches'  => $library,
2925
                'borrowers' => $patron->unblessed,
2927
                'borrowers' => $patron->unblessed,
2926
                'biblio'    => $biblio,
2928
                'biblio'    => $biblio,
Lines 2933-2939 sub NotifyOrderUsers { Link Here
2933
                    letter                 => $letter,
2935
                    letter                 => $letter,
2934
                    borrowernumber         => $borrowernumber,
2936
                    borrowernumber         => $borrowernumber,
2935
                    LibraryName            => C4::Context->preference("LibraryName"),
2937
                    LibraryName            => C4::Context->preference("LibraryName"),
2936
                    message_transport_type => $patron->message_transport_type_for('email'),
2938
                    message_transport_type => $mtt,
2937
                }
2939
                }
2938
            ) or warn "can't enqueue letter $letter";
2940
            ) or warn "can't enqueue letter $letter";
2939
        }
2941
        }
(-)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 (-8 / +9 lines)
Lines 195-207 sub notify_owner { Link Here
195
    my $toaddr = $patron->notice_email_address or return;
195
    my $toaddr = $patron->notice_email_address or return;
196
196
197
    #prepare letter
197
    #prepare letter
198
    my $mtt    = $patron->message_transport_type_for('email');
198
    my $letter = C4::Letters::GetPreparedLetter(
199
    my $letter = C4::Letters::GetPreparedLetter(
199
        module      => 'lists',
200
        module                 => 'lists',
200
        letter_code => 'SHARE_ACCEPT',
201
        letter_code            => 'SHARE_ACCEPT',
201
        branchcode  => C4::Context->userenv->{"branch"},
202
        branchcode             => C4::Context->userenv->{"branch"},
202
        lang        => $patron->lang,
203
        message_transport_type => $mtt,
203
        tables      => { borrowers => $loggedinuser, },
204
        lang                   => $patron->lang,
204
        substitute  => { listname  => $param->{shelfname}, },
205
        tables                 => { borrowers => $loggedinuser, },
206
        substitute             => { listname  => $param->{shelfname}, },
205
    );
207
    );
206
208
207
    #send letter to queue
209
    #send letter to queue
Lines 210-216 sub notify_owner { Link Here
210
            letter                 => $letter,
212
            letter                 => $letter,
211
            message_transport_type => 'email',
213
            message_transport_type => 'email',
212
            from_address           => C4::Context->preference('KohaAdminEmailAddress'),
214
            from_address           => C4::Context->preference('KohaAdminEmailAddress'),
213
            message_transport_type => $patron->message_transport_type_for('email'),
215
            message_transport_type => $mtt,
214
        }
216
        }
215
    );
217
    );
216
}
218
}
217
- 

Return to bug 21781