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

(-)a/opac/opac-issue-note.pl (-5 / +15 lines)
Lines 43-52 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here
43
    }
43
    }
44
);
44
);
45
45
46
my $member = C4::Members::GetMember( borrowernumber => $borrowernumber );
46
my $patron = Koha::Patrons->find( $borrowernumber );
47
$template->param(
47
$template->param(
48
    firstname      => $member->{'firstname'},
48
    firstname      => $patron->firstname,
49
    surname        => $member->{'surname'},
49
    surname        => $patron->surname,
50
    borrowernumber => $borrowernumber,
50
    borrowernumber => $borrowernumber,
51
);
51
);
52
52
Lines 76-85 if ( $action eq 'issuenote' && C4::Context->preference('AllowCheckoutNotes') ) { Link Here
76
                branchcode => $branch,
76
                branchcode => $branch,
77
                tables => {
77
                tables => {
78
                    'biblio' => $biblio->{biblionumber},
78
                    'biblio' => $biblio->{biblionumber},
79
                    'borrowers' => $member->{borrowernumber},
79
                    'borrowers' => $patron->borrowernumber,
80
                },
80
                },
81
            );
81
            );
82
            C4::Message->enqueue($letter, $member, 'email');
82
83
            my $to_address = $branch->branchemail || $branch->branchreplyto || C4::Context->ReplytoDefault || C4::Context->preference('KohaAdminEmailAddress');
84
            my $from_address = $patron->email || $patron->emailpro || $patron->B_email;
85
86
            C4::Letters::EnqueueLetter({
87
                letter => $letter,
88
                message_transport_type => 'email',
89
                borrowernumber => $patron->borrowernumber,
90
                to_address => $to_address,
91
                from_address => $from_address,
92
            });
83
        }
93
        }
84
    }
94
    }
85
    print $query->redirect("/cgi-bin/koha/opac-user.pl");
95
    print $query->redirect("/cgi-bin/koha/opac-user.pl");
(-)a/opac/svc/patron_notes (-5 / +14 lines)
Lines 57-63 if ($is_ajax) { Link Here
57
        my $issue_id = $query->param('issue_id');
57
        my $issue_id = $query->param('issue_id');
58
        my $clean_note = $scrubber->scrub($note);
58
        my $clean_note = $scrubber->scrub($note);
59
        my $status = "saved";
59
        my $status = "saved";
60
        my ($member, $issue);
60
        my ($patron, $issue);
61
61
62
        my ( $template, $borrowernumber, $cookie ) = C4::Auth::get_template_and_user({
62
        my ( $template, $borrowernumber, $cookie ) = C4::Auth::get_template_and_user({
63
            template_name   => "opac-user.tt",
63
            template_name   => "opac-user.tt",
Lines 68-74 if ($is_ajax) { Link Here
68
68
69
        # verify issue_id
69
        # verify issue_id
70
        if ( $issue_id =~ /\d+/ ) {
70
        if ( $issue_id =~ /\d+/ ) {
71
            $member = GetMember(borrowernumber => $borrowernumber);
71
            $patron = Koha::Patrons->find( $borrowernumber ); # Double fetch is specific to 17.05
72
            $issue = Koha::Checkouts->find($issue_id);
72
            $issue = Koha::Checkouts->find($issue_id);
73
            if ( $issue->borrowernumber != $borrowernumber ) {
73
            if ( $issue->borrowernumber != $borrowernumber ) {
74
                $status = "fail";
74
                $status = "fail";
Lines 86-95 if ($is_ajax) { Link Here
86
                    branchcode => $branch,
86
                    branchcode => $branch,
87
                    tables => {
87
                    tables => {
88
                        'biblio' => $biblio->{biblionumber},
88
                        'biblio' => $biblio->{biblionumber},
89
                        'borrowers' => $member->{borrowernumber},
89
                        'borrowers' => $patron->borrowernumber,
90
                    },
90
                    },
91
                );
91
                );
92
                C4::Message->enqueue($letter, $member, 'email');
92
93
                my $to_address = $branch->branchemail || $branch->branchreplyto || C4::Context->ReplytoDefault || C4::Context->preference('KohaAdminEmailAddress');
94
                my $from_address = $patron->email || $patron->emailpro || $patron->B_email;
95
96
                C4::Letters::EnqueueLetter({
97
                    letter => $letter,
98
                    message_transport_type => 'email',
99
                    borrowernumber => $patron->borrowernumber,
100
                    to_address => $to_address,
101
                    from_address => $from_address,
102
                });
93
            } else { # note empty, i.e removed
103
            } else { # note empty, i.e removed
94
                $status = "removed";
104
                $status = "removed";
95
            }
105
            }
96
- 

Return to bug 19496