Bug 26265: (QA follow-up) Remove g option from regex, add few dirs

[koha-equinox.git] / opac / opac-issue-note.pl

diff --git a/opac/opac-issue-note.pl b/opac/opac-issue-note.pl
index 832e365..3e7f0a1 100755 (executable)
--- 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,10 +43,10 @@ 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,
 );
 
@@ -67,19 +67,30 @@ if ( $action eq 'issuenote' && C4::Context->preference('AllowCheckoutNotes') ) {
     my $note = $query->param('note');
     my $scrubber = C4::Scrubber->new();
     my $clean_note = $scrubber->scrub($note);
-    if ( $issue->set({ notedate => dt_from_string(), note => $clean_note })->store ) {
+    if ( $issue->set({ notedate => dt_from_string(), note => $clean_note, noteseen => 0 })->store ) {
         if ($clean_note) { # only send email if note not empty
             my $branch = Koha::Libraries->find( $issue->branchcode );
             my $letter = C4::Letters::GetPreparedLetter (
                 module => 'circulation',
-                letter_code => 'PATRON_NOTE',
+                letter_code => 'CHECKOUT_NOTE',
                 branchcode => $branch,
+                lang => $patron->lang,
                 tables => {
                     'biblio' => $biblio->biblionumber,
-                    'borrowers' => $member->{borrowernumber},
+                    'borrowers' => $borrowernumber,
                 },
             );
-            C4::Message->enqueue($letter, $member, 'email');
+
+            my $to_address = $branch->inbound_email_address;
+            my $reply_address = $patron->email || $patron->emailpro || $patron->B_email;
+
+            C4::Letters::EnqueueLetter({
+                letter => $letter,
+                message_transport_type => 'email',
+                borrowernumber => $patron->borrowernumber,
+                to_address => $to_address,
+                reply_address => $reply_address,
+            });
         }
     }
     print $query->redirect("/cgi-bin/koha/opac-user.pl");