X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-issue-note.pl;h=c279545e872991e7602a8d281aa2d9747404ae29;hb=149cb5014932749cb0c13a2a8ae3ff18bfd4dc52;hp=becd7083f740de7b61a6faaf16d5e4b27ae7397f;hpb=c4dd097d20040cc2786ca062d306b8eee1f005e2;p=koha.git

diff --git a/opac/opac-issue-note.pl b/opac/opac-issue-note.pl
index becd7083f7..c279545e87 100755
--- a/opac/opac-issue-note.pl
+++ b/opac/opac-issue-note.pl
@@ -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,21 +43,21 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     }
 );
 
-my $member = C4::Members::GetMember( borrowernumber => $borrowernumber );
+my $patron = Koha::Patrons->find( $borrowernumber );
 $template->param(
-    firstname      => $member->{'firstname'},
-    surname        => $member->{'surname'},
+    firstname      => $patron->firstname,
+    surname        => $patron->surname,
     borrowernumber => $borrowernumber,
 );
 
 my $issue_id = $query->param('issue_id');
 my $issue = Koha::Checkouts->find( $issue_id );
 my $itemnumber = $issue->itemnumber;
-my $biblio = GetBiblioFromItemNumber($itemnumber);
+my $biblio = $issue->item->biblio;
 $template->param(
     issue_id   => $issue_id,
-    title      => $biblio->{'title'},
-    author     => $biblio->{'author'},
+    title      => $biblio->title,
+    author     => $biblio->author,
     note       => $issue->note,
     itemnumber => $issue->itemnumber,
 );
@@ -72,14 +72,24 @@ if ( $action eq 'issuenote' && C4::Context->preference('AllowCheckoutNotes') ) {
             my $branch = Koha::Libraries->find( $issue->branchcode );
             my $letter = C4::Letters::GetPreparedLetter (
                 module => 'circulation',
-                letter_code => 'PATRON_NOTE',
+                letter_code => 'CHECKOUT_NOTE',
                 branchcode => $branch,
                 tables => {
-                    'biblio' => $biblio->{biblionumber},
-                    'borrowers' => $member->{borrowernumber},
+                    'biblio' => $biblio->biblionumber,
+                    'borrowers' => $borrowernumber,
                 },
             );
-            C4::Message->enqueue($letter, $member, 'email');
+
+            my $to_address = $branch->branchemail || $branch->branchreplyto || C4::Context->ReplytoDefault || C4::Context->preference('KohaAdminEmailAddress');
+            my $from_address = $patron->email || $patron->emailpro || $patron->B_email;
+
+            C4::Letters::EnqueueLetter({
+                letter => $letter,
+                message_transport_type => 'email',
+                borrowernumber => $patron->borrowernumber,
+                to_address => $to_address,
+                from_address => $from_address,
+            });
         }
     }
     print $query->redirect("/cgi-bin/koha/opac-user.pl");