Bug 30952: Fix toolbar positioning and spacing

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

diff --git a/opac/opac-issue-note.pl b/opac/opac-issue-note.pl
index f97acdb..b59e838 100755 (executable)
--- a/opac/opac-issue-note.pl
+++ b/opac/opac-issue-note.pl
@@ -23,23 +23,20 @@ use CGI qw ( -utf8 );
 use C4::Koha;
 use C4::Context;
 use C4::Scrubber;
-use C4::Output;
-use C4::Auth;
-use C4::Biblio;
+use C4::Output qw( output_html_with_http_headers );
+use C4::Auth qw( get_template_and_user );
 use C4::Letters;
 use Koha::Checkouts;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 use Koha::Patrons;
 
-my $query = new CGI;
+my $query = CGI->new;
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
         template_name   => "opac-issue-note.tt",
         query           => $query,
         type            => "opac",
-        authnotrequired => 0,
-        debug           => 1,
     }
 );
 
@@ -51,7 +48,14 @@ $template->param(
 );
 
 my $issue_id = $query->param('issue_id');
-my $issue = Koha::Checkouts->find( $issue_id );
+my $issue = $patron->checkouts->find( $issue_id );
+
+unless ( $issue ) {
+    # exit early
+    print $query->redirect("/cgi-bin/koha/opac-user.pl");
+    exit;
+}
+
 my $itemnumber = $issue->itemnumber;
 my $biblio = $issue->item->biblio;
 $template->param(
@@ -63,10 +67,11 @@ $template->param(
 );
 
 my $action = $query->param('action') || "";
-if ( $action eq 'issuenote' && C4::Context->preference('AllowCheckoutNotes') ) {
+if ( $action eq 'issuenote' && C4::Context->preference('AllowCheckoutNotes') && $issue ) {
     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, noteseen => 0 })->store ) {
         if ($clean_note) { # only send email if note not empty
             my $branch = Koha::Libraries->find( $issue->branchcode );
@@ -74,21 +79,22 @@ if ( $action eq 'issuenote' && C4::Context->preference('AllowCheckoutNotes') ) {
                 module => 'circulation',
                 letter_code => 'CHECKOUT_NOTE',
                 branchcode => $branch,
+                lang => $patron->lang,
                 tables => {
                     'biblio' => $biblio->biblionumber,
                     'borrowers' => $borrowernumber,
                 },
             );
 
-            my $to_address = $branch->branchemail || $branch->branchreplyto || C4::Context->ReplytoDefault || C4::Context->preference('KohaAdminEmailAddress');
-            my $from_address = $patron->email || $patron->emailpro || $patron->B_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,
-                from_address => $from_address,
+                reply_address => $reply_address,
             });
         }
     }