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

(-)a/opac/opac-issue-note.pl (-6 / +6 lines)
Lines 23-35 use CGI qw ( -utf8 ); Link Here
23
use C4::Koha;
23
use C4::Koha;
24
use C4::Context;
24
use C4::Context;
25
use C4::Scrubber;
25
use C4::Scrubber;
26
use C4::Members;
27
use C4::Output;
26
use C4::Output;
28
use C4::Auth;
27
use C4::Auth;
29
use C4::Biblio;
28
use C4::Biblio;
30
use C4::Letters;
29
use C4::Letters;
31
use Koha::Checkouts;
30
use Koha::Checkouts;
32
use Koha::DateUtils;
31
use Koha::DateUtils;
32
use Koha::Patrons;
33
33
34
my $query = new CGI;
34
my $query = new CGI;
35
35
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' => $borrowernumber,
80
                },
80
                },
81
            );
81
            );
82
            C4::Message->enqueue($letter, $member, 'email');
82
            C4::Message->enqueue($letter, $patron->unblessed, 'email');
83
        }
83
        }
84
    }
84
    }
85
    print $query->redirect("/cgi-bin/koha/opac-user.pl");
85
    print $query->redirect("/cgi-bin/koha/opac-user.pl");
(-)a/opac/svc/patron_notes (-6 / +5 lines)
Lines 27-36 use CGI; Link Here
27
use C4::Output qw(:DEFAULT :ajax);
27
use C4::Output qw(:DEFAULT :ajax);
28
use C4::Scrubber;
28
use C4::Scrubber;
29
use C4::Circulation;
29
use C4::Circulation;
30
use C4::Members;
31
use C4::Biblio;
30
use C4::Biblio;
32
use Koha::Checkouts;
31
use Koha::Checkouts;
33
use Koha::DateUtils;
32
use Koha::DateUtils;
33
use Koha::Patrons;
34
34
35
=head1 NAME
35
=head1 NAME
36
36
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 );
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' => $biblionumber,
88
                        'biblio' => $biblionumber,
89
                        'borrowers' => $member->{borrowernumber},
89
                        'borrowers' => $borrowernumber,
90
                    },
90
                    },
91
                );
91
                );
92
                C4::Message->enqueue($letter, $member, 'email');
92
                C4::Message->enqueue($letter, $patron->unblessed, 'email');
93
            } else { # note empty, i.e removed
93
            } else { # note empty, i.e removed
94
                $status = "removed";
94
                $status = "removed";
95
            }
95
            }
96
- 

Return to bug 18938