5239269216
This patch replaces the <<biblio.item>> in the email with <<biblio.title>> and uses CHECKOUT_NOTE instead of PATRON_NOTE. This patch also adds the notice to installer/data/mysql/en/mandatory/sample_notices.sql, and updates the PATRON_NOTE entry in installer/data/mysql/updatedatabase.pl To test: 1) Apply patch and update database 2) View the message_queue table in mysql 3) Check out an item if haven't already 4) Go to OPAC and set a checkout note for an item 5) View message_queue table and confirm it the title is included in the email and all instances of 'patron note' have been replaced with 'checkout note' 6) Disable javascript in browser 7) repeat steps 4 and 5 and confirm all works as expected Sponsored-by: Catalyst IT Signed-off-by: Marjorie Vila <marjorie.barry-vila@collecto.ca> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
98 lines
3.2 KiB
Perl
Executable file
98 lines
3.2 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# Copyright 2016 Aleisha Amohia <aleisha@catalyst.net.nz>
|
|
#
|
|
# This file is part of Koha.
|
|
#
|
|
# Koha is free software; you can redistribute it and/or modify it
|
|
# under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# Koha is distributed in the hope that it will be useful, but
|
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with Koha; if not, see <http://www.gnu.org/licenses>.
|
|
|
|
use Modern::Perl;
|
|
|
|
use CGI qw ( -utf8 );
|
|
use C4::Koha;
|
|
use C4::Context;
|
|
use C4::Scrubber;
|
|
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;
|
|
|
|
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "opac-issue-note.tt",
|
|
query => $query,
|
|
type => "opac",
|
|
authnotrequired => 0,
|
|
debug => 1,
|
|
}
|
|
);
|
|
|
|
my $patron = Koha::Patrons->find( $borrowernumber );
|
|
$template->param(
|
|
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 = $issue->item->biblio;
|
|
$template->param(
|
|
issue_id => $issue_id,
|
|
title => $biblio->title,
|
|
author => $biblio->author,
|
|
note => $issue->note,
|
|
itemnumber => $issue->itemnumber,
|
|
);
|
|
|
|
my $action = $query->param('action') || "";
|
|
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 ($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 => 'CHECKOUT_NOTE',
|
|
branchcode => $branch,
|
|
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;
|
|
|
|
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");
|
|
}
|
|
|
|
output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 };
|