Bug 17600: Standardize our EXPORT_OK

[srvgit] / course_reserves / add_items.pl

diff --git a/course_reserves/add_items.pl b/course_reserves/add_items.pl
index fc705e1..10b74a4 100755 (executable)
--- a/course_reserves/add_items.pl
+++ b/course_reserves/add_items.pl
@@ -22,71 +22,132 @@ use Modern::Perl;
 
 use CGI qw ( -utf8 );
 
-use C4::Auth;
-use C4::Output;
-use C4::Koha;
-use C4::Biblio;
+use C4::Auth qw( get_template_and_user );
+use C4::Output qw( output_html_with_http_headers );
+use C4::Koha qw( GetAuthorisedValues );
 use Koha::Items;
 
-use C4::CourseReserves qw(GetCourse GetCourseItem GetCourseReserve ModCourseItem ModCourseReserve);
+use C4::CourseReserves qw( GetCourse GetCourseReserve ModCourse ModCourseItem ModCourseReserve );
 
-my $cgi = new CGI;
+use Koha::Items;
+use Koha::ItemTypes;
+
+my $cgi = CGI->new;
 
 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 $itemnumber   = $cgi->param('itemnumber')   || '';
+my $is_edit      = $cgi->param('is_edit')      || '';
+my $biblionumber = $cgi->param('biblionumber') || '';
+
+$barcode =~ s/^\s*|\s*$//g; #remove leading/trailing whitespace
+$biblionumber =~ s/^\s*|\s*$//g; #remove leading/trailing whitespace
 
-my $item = Koha::Items->find( { ( $itemnumber ? ( itemnumber => $itemnumber ) : ( barcode => $barcode ) ) } );
-my $title = ($item) ? $item->biblio->title : undef;
+my ( $item, $biblio );
+
+if ( $barcode || $itemnumber ) {
+    # adding an item to course items
+    $item = $itemnumber ? Koha::Items->find( $itemnumber ) : Koha::Items->find({ barcode => $barcode });
+    if ( $item ) {
+        $itemnumber = $item->id;
+        $biblio = $item->biblio;
+    }
+} else {
+    # adding a biblio to course items
+    $biblio = Koha::Biblios->find( $biblionumber );
+}
 
-my $step = ( $action eq 'lookup' && $item ) ? '2' : '1';
+my $step = ( $action eq 'lookup' && ( $item or $biblio ) ) ? '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/$tmpl",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { coursereserves => 'add_reserves' },
     }
 );
-my $inumber = $itemnumber ? "(blank) (itemnumber:$itemnumber)" : "";
-$template->param( ERROR_BARCODE_NOT_FOUND => $barcode . $inumber )
-  unless ( $barcode && !$itemnumber && $item && $action eq 'lookup' );
+
+if ( !$item && !$biblio && $action eq 'lookup' ){
+    $template->param( ERROR_ITEM_NOT_FOUND => 1 );
+    $template->param( UNKNOWN_BARCODE => $barcode ) if $barcode;
+    $template->param( UNKNOWN_BIBLIONUMBER => $biblionumber ) if $biblionumber;
+}
 
 $template->param( course => GetCourse($course_id) );
 
-if ( $action eq 'lookup' ) {
-    my $course_item = GetCourseItem( itemnumber => $item->{'itemnumber'} );
+if ( $action eq 'lookup' and $item ) {
+    my $course_item = Koha::Course::Items->find({ itemnumber => $item->id });
     my $course_reserve =
       ($course_item)
       ? GetCourseReserve(
         course_id => $course_id,
-        ci_id     => $course_item->{'ci_id'}
+        ci_id     => $course_item->ci_id,
       )
       : undef;
 
+    my $itemtypes = Koha::ItemTypes->search;
     $template->param(
         item           => $item,
-        title          => $title,
+        biblio         => $biblio,
         course_item    => $course_item,
         course_reserve => $course_reserve,
+        is_edit        => $is_edit,
 
         ccodes    => GetAuthorisedValues('CCODE'),
         locations => GetAuthorisedValues('LOC'),
-        itypes    => GetItemTypes( style => 'array' ),
+        itypes    => $itemtypes, # FIXME We certainly want to display the translated_description in the template
+        return    => $return,
+    );
+
+} elsif ( $action eq 'lookup' and $biblio ) {
+    my $course_item = Koha::Course::Items->find({ biblionumber => $biblio->biblionumber });
+    my $course_reserve =
+      ($course_item)
+      ? GetCourseReserve(
+        course_id => $course_id,
+        ci_id     => $course_item->ci_id,
+      )
+      : undef;
+
+    my $itemtypes = Koha::ItemTypes->search;
+    $template->param(
+        biblio         => $biblio,
+        course_item    => $course_item,
+        course_reserve => $course_reserve,
+        is_edit        => $is_edit,
+
         return    => $return,
     );
 
 } elsif ( $action eq 'add' ) {
+    my $itype         = scalar $cgi->param('itype');
+    my $ccode         = scalar $cgi->param('ccode');
+    my $homebranch    = $cgi->param('homebranch');
+    my $holdingbranch = scalar $cgi->param('holdingbranch');
+    my $location      = scalar $cgi->param('location');
+
+    my $itype_enabled         = scalar $cgi->param('itype_enabled') ? 1 : 0;
+    my $ccode_enabled         = scalar $cgi->param('ccode_enabled') ? 1 : 0;
+    my $homebranch_enabled    = $cgi->param('homebranch_enabled') ? 1 : 0;
+    my $holdingbranch_enabled = scalar $cgi->param('holdingbranch_enabled') ? 1 : 0;
+    my $location_enabled      = scalar $cgi->param('location_enabled') ? 1 : 0;
+
     my $ci_id = ModCourseItem(
-        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'),
+            itemnumber    => $itemnumber,
+            biblionumber  => $biblionumber,
+            itype         => $itype,
+            ccode         => $ccode,
+            homebranch    => $homebranch,
+            holdingbranch => $holdingbranch,
+            location      => $location,
+            itype_enabled         => $itype_enabled,
+            ccode_enabled         => $ccode_enabled,
+            homebranch_enabled    => $homebranch_enabled,
+            holdingbranch_enabled => $holdingbranch_enabled,
+            location_enabled      => $location_enabled,
     );
 
     my $cr_id = ModCourseReserve(