gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Bug 18938: (bug 17829 follow-up) Replace 2 occurrences of GetMember left behind" 

This reverts commit 8af64fe612.
This commit is contained in:
Fridolin Somers 2017-07-18 16:38:23 +02:00
parent 8af64fe612
commit ecc3bce9b5
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
opac/opac-issue-note.pl
View File

@ -23,13 +23,13 @@ use CGI qw ( -utf8 );
use C4::Koha;
use C4::Context;
use C4::Scrubber;
use C4::Members;
use C4::Output;
use C4::Auth;
use C4::Biblio;
use C4::Letters;
use Koha::Checkouts;
use Koha::DateUtils;
use Koha::Patrons;
my $query = new CGI;
@ -43,10 +43,10 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
}
);
my $patron = Koha::Patrons->find( $borrowernumber );
my $member = C4::Members::GetMember( borrowernumber => $borrowernumber );
$template->param(
firstname => $patron->firstname,
surname => $patron->surname,
firstname => $member->{'firstname'},
surname => $member->{'surname'},
borrowernumber => $borrowernumber,
);
@ -76,10 +76,10 @@ if ( $action eq 'issuenote' && C4::Context->preference('AllowCheckoutNotes') ) {
branchcode => $branch,
tables => {
'biblio' => $biblio->{biblionumber},
'borrowers' => $borrowernumber,
'borrowers' => $member->{borrowernumber},
},
);
C4::Message->enqueue($letter, $patron->unblessed, 'email');
C4::Message->enqueue($letter, $member, 'email');
}
}
print $query->redirect("/cgi-bin/koha/opac-user.pl");

10
opac/svc/patron_notes
View File

@ -27,10 +27,10 @@ use CGI;
use C4::Output qw(:DEFAULT :ajax);
use C4::Scrubber;
use C4::Circulation;
use C4::Members;
use C4::Biblio;
use Koha::Checkouts;
use Koha::DateUtils;
use Koha::Patrons;
=head1 NAME
@ -57,7 +57,7 @@ if ($is_ajax) {
my $issue_id = $query->param('issue_id');
my $clean_note = $scrubber->scrub($note);
my $status = "saved";
my ($patron, $issue);
my ($member, $issue);
my ( $template, $borrowernumber, $cookie ) = C4::Auth::get_template_and_user({
template_name => "opac-user.tt",
@ -68,7 +68,7 @@ if ($is_ajax) {
# verify issue_id
if ( $issue_id =~ /\d+/ ) {
$patron = Koha::Patrons->find( $borrowernumber );
$member = GetMember(borrowernumber => $borrowernumber);
$issue = Koha::Checkouts->find($issue_id);
if ( $issue->borrowernumber != $borrowernumber ) {
$status = "fail";
@ -86,10 +86,10 @@ if ($is_ajax) {
branchcode => $branch,
tables => {
'biblio' => $biblio->{biblionumber},
'borrowers' => $borrowernumber,
'borrowers' => $member->{borrowernumber},
},
);
C4::Message->enqueue($letter, $patron->unblessed, 'email');
C4::Message->enqueue($letter, $member, 'email');
} else { # note empty, i.e removed
$status = "removed";
}