Bug 18367 - Fix untranslatable string from Bug 18264

[koha.git] / course_reserves / add_items.pl

diff --git a/course_reserves/add_items.pl b/course_reserves/add_items.pl
index bbf67d5..3583699 100755 (executable)
--- a/course_reserves/add_items.pl
+++ b/course_reserves/add_items.pl
@@ -5,93 +5,107 @@
 #
 # 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 Modern::Perl;
 
-use CGI;
+use CGI qw ( -utf8 );
 
 use C4::Auth;
 use C4::Output;
 use C4::Koha;
 use C4::Biblio;
-use C4::Branch;
+use Koha::Items;
 
-use C4::CourseReserves;
+use C4::CourseReserves qw(GetCourse GetCourseItem GetCourseReserve ModCourseItem ModCourseReserve);
 
-my $cgi = new CGI;
+use Koha::Items;
+use Koha::ItemTypes;
 
-my $action    = $cgi->param('action')    || '';
-my $course_id = $cgi->param('course_id') || '';
-my $barcode   = $cgi->param('barcode')   || '';
+my $cgi = new CGI;
 
-die('No course_id provided') unless ($course_id);
+my $action       = $cgi->param('action')       || '';
+my $course_id    = $cgi->param('course_id')    || '';
+my $barcode      = $cgi->param('barcode')      || '';
+my $return       = $cgi->param('return')       || '';
+my $itemnumber   = ($cgi->param('itemnumber') && $action eq 'lookup') ? $cgi->param('itemnumber') : '';
 
-my $item = GetBiblioFromItemNumber( undef, $barcode );
+my $item = Koha::Items->find( { ( $itemnumber ? ( itemnumber => $itemnumber ) : ( barcode => $barcode ) ) } );
+my $title = ($item) ? $item->biblio->title : undef;
 
 my $step = ( $action eq 'lookup' && $item ) ? '2' : '1';
 
+my $tmpl = ($course_id) ? "add_items-step$step.tt" : "invalid-course.tt";
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {
-        template_name   => "course_reserves/add_items-step$step.tmpl",
+    {   template_name   => "course_reserves/$tmpl",
         query           => $cgi,
         type            => "intranet",
         authnotrequired => 0,
         flagsrequired   => { coursereserves => 'add_reserves' },
     }
 );
-$template->param( ERROR_BARCODE_NOT_FOUND => $barcode )
-  unless ( $barcode && $item && $action eq 'lookup' );
+
+unless ( $item && $action eq 'lookup' ){
+    $template->param( ERROR_ITEM_NOT_FOUND => 1 );
+    $template->param( UNKNOWN_BARCODE => $barcode ) if $barcode;
+}
 
 $template->param( course => GetCourse($course_id) );
 
-if ( $action eq 'lookup' ) {
-    my $course_item = GetCourseItem( itemnumber => $item->{'itemnumber'} );
-    my $course_reserve = ($course_item)
+if ( $action eq 'lookup' and $item ) {
+    my $course_item = GetCourseItem( itemnumber => $item->itemnumber );
+    my $course_reserve =
+      ($course_item)
       ? GetCourseReserve(
         course_id => $course_id,
         ci_id     => $course_item->{'ci_id'}
       )
       : undef;
 
+    my $itemtypes = Koha::ItemTypes->search;
     $template->param(
         item           => $item,
+        biblio         => $item->biblio,
         course_item    => $course_item,
         course_reserve => $course_reserve,
 
         ccodes    => GetAuthorisedValues('CCODE'),
         locations => GetAuthorisedValues('LOC'),
-        itypes    => GetItemTypes( style => 'array' ),
-        branches  => GetBranchesLoop(),
+        itypes    => $itemtypes, # FIXME We certainly want to display the translated_description in the template
+        return    => $return,
     );
 
-}
-elsif ( $action eq 'add' ) {
+} elsif ( $action eq 'add' ) {
     my $ci_id = ModCourseItem(
-        itemnumber    => $cgi->param('itemnumber'),
-        itype         => $cgi->param('itype'),
-        ccode         => $cgi->param('ccode'),
-        holdingbranch => $cgi->param('holdingbranch'),
-        location      => $cgi->param('location'),
+        itemnumber    => scalar $cgi->param('itemnumber'),
+        itype         => scalar $cgi->param('itype'),
+        ccode         => scalar $cgi->param('ccode'),
+        holdingbranch => scalar $cgi->param('holdingbranch'),
+        location      => scalar $cgi->param('location'),
     );
 
     my $cr_id = ModCourseReserve(
         course_id   => $course_id,
         ci_id       => $ci_id,
-        staff_note  => $cgi->param('staff_note'),
-        public_note => $cgi->param('public_note'),
+        staff_note  => scalar $cgi->param('staff_note'),
+        public_note => scalar $cgi->param('public_note'),
     );
+
+    if ( $return ) {
+        print $cgi->redirect("/cgi-bin/koha/course_reserves/course-details.pl?course_id=$return");
+        exit;
+    }
 }
 
 output_html_with_http_headers $cgi, $cookie, $template->output;