Bug 17698: (follow-up) Fixing things in Comment 57

[srvgit] / circ / hold-transfer-slip.pl

diff --git a/circ/hold-transfer-slip.pl b/circ/hold-transfer-slip.pl
index fa75d10..328f481 100755 (executable)
--- a/circ/hold-transfer-slip.pl
+++ b/circ/hold-transfer-slip.pl
@@ -5,27 +5,25 @@
 #
 # 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 2 of the License, or (at your option) any later
-# version.
+# 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.
+# 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, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
-use strict;
+use Modern::Perl;
 use C4::Context;
 use C4::Output;
-use CGI;
-use C4::Auth;
+use CGI qw ( -utf8 );
+use C4::Auth qw/:DEFAULT get_session/;
 use C4::Reserves;
-use C4::Branch;
-use C4::Dates qw/format_date format_date_in_iso/;
 
 use vars qw($debug);
 
@@ -34,13 +32,17 @@ BEGIN {
 }
 
 my $input = new CGI;
+my $sessionID = $input->cookie("CGISESSID");
+my $session = get_session($sessionID);
+
 my $biblionumber = $input->param('biblionumber');
 my $borrowernumber = $input->param('borrowernumber');
-my $transfer = $input->param('transfer');
+my $itemnumber = $input->param('itemnumber');
+my $barcode = $input->param('barcode');
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {   
-        template_name   => "circ/hold-transfer-slip.tmpl",
+    {
+        template_name   => "circ/printslip.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
@@ -49,17 +51,21 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-my $reserveinfo = GetReserveInfo($borrowernumber,$biblionumber );
-my $pulldate = C4::Dates->new();
-$reserveinfo->{'pulldate'} = $pulldate->output();
-$reserveinfo->{'branchname'} = GetBranchName($reserveinfo->{'branchcode'});
-$reserveinfo->{'transferrequired'} = $transfer;
-
-$template->param( reservedata => [ $reserveinfo ] ,
-                               );
+my $userenv = C4::Context->userenv;
+my ($slip, $is_html);
+if ( my $letter = ReserveSlip ({
+    branchcode     => $session->param('branch') || $userenv->{branch},
+    borrowernumber => $borrowernumber,
+    biblionumber   => $biblionumber,
+    itemnumber     => $itemnumber,
+    barcode        => $barcode,
+}) ) {
+    $slip = $letter->{content};
+    $is_html = $letter->{is_html};
+}
+$template->param( slip => $slip ) if ($slip);
+$template->param( caller => 'hold-transfer' );
+$template->param( plain => !$is_html );
 
 output_html_with_http_headers $input, $cookie, $template->output;
 
-
-
-