Bug 22417: Fix borrowernumber values

[srvgit] / admin / itemtypes.pl

diff --git a/admin/itemtypes.pl b/admin/itemtypes.pl
index 723dfe9..ff9bdad 100755 (executable)
--- a/admin/itemtypes.pl
+++ b/admin/itemtypes.pl
@@ -45,7 +45,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {   template_name   => "admin/itemtypes.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { parameters => 'manage_itemtypes' },
         debug           => 1,
     }
@@ -58,24 +57,46 @@ undef($sip_media_type) if defined($sip_media_type) and $sip_media_type =~ /^\s*$
 
 if ( $op eq 'add_form' ) {
     my $itemtype = Koha::ItemTypes->find($itemtype_code);
+
+    my $selected_branches = $itemtype ? $itemtype->get_library_limits : undef;
+    my $branches = Koha::Libraries->search( {}, { order_by => ['branchname'] } )->unblessed;
+    my @branches_loop;
+    foreach my $branch ( @$branches ) {
+        my $selected = ($selected_branches && grep {$_->branchcode eq $branch->{branchcode}} @{ $selected_branches->as_list } ) ? 1 : 0;
+        push @branches_loop, {
+            branchcode => $branch->{branchcode},
+            branchname => $branch->{branchname},
+            selected   => $selected,
+        };
+    }
+
+    my $parent_type = $itemtype ? $itemtype->parent_type : undef;
+    my $parent_types = Koha::ItemTypes->search({parent_type=>undef,itemtype => {'!='=>$itemtype_code}});
     my $imagesets = C4::Koha::getImageSets( checked => ( $itemtype ? $itemtype->imageurl : undef ) );
     my $searchcategory = GetAuthorisedValues("ITEMTYPECAT");
     my $translated_languages = C4::Languages::getTranslatedLanguages( undef , C4::Context->preference('template') );
     $template->param(
         itemtype  => $itemtype,
+        parent_type => $parent_type,
+        parent_types => $parent_types,
+        is_a_parent => $itemtype ? Koha::ItemTypes->search({parent_type=>$itemtype_code})->count : 0,
         imagesets => $imagesets,
         searchcategory => $searchcategory,
         can_be_translated => ( scalar(@$translated_languages) > 1 ? 1 : 0 ),
+        branches_loop    => \@branches_loop,
     );
 } elsif ( $op eq 'add_validate' ) {
     my $is_a_modif   = $input->param('is_a_modif');
     my $itemtype     = Koha::ItemTypes->find($itemtype_code);
+    my $parent_type  = $input->param('parent_type') || undef;
     my $description  = $input->param('description');
     my $rentalcharge = $input->param('rentalcharge');
-    my $rental_charge_daily = $input->param('rental_charge_daily');
+    my $rentalcharge_daily = $input->param('rentalcharge_daily');
+    my $rentalcharge_hourly = $input->param('rentalcharge_hourly');
     my $defaultreplacecost = $input->param('defaultreplacecost');
     my $processfee = $input->param('processfee');
     my $image = $input->param('image') || q||;
+    my @branches = grep { $_ ne q{} } $input->multi_param('branches');
 
     my $notforloan = $input->param('notforloan') ? 1 : 0;
     my $imageurl =
@@ -89,11 +110,15 @@ if ( $op eq 'add_form' ) {
     my $checkinmsgtype = $input->param('checkinmsgtype');
     my $hideinopac     = $input->param('hideinopac') // 0;
     my $searchcategory = $input->param('searchcategory');
+    my $rentalcharge_daily_calendar  = $input->param('rentalcharge_daily_calendar') // 0;
+    my $rentalcharge_hourly_calendar = $input->param('rentalcharge_hourly_calendar') // 0;
 
     if ( $itemtype and $is_a_modif ) {    # it's a modification
         $itemtype->description($description);
+        $itemtype->parent_type($parent_type);
         $itemtype->rentalcharge($rentalcharge);
-        $itemtype->rental_charge_daily($rental_charge_daily);
+        $itemtype->rentalcharge_daily($rentalcharge_daily);
+        $itemtype->rentalcharge_hourly($rentalcharge_hourly);
         $itemtype->defaultreplacecost($defaultreplacecost);
         $itemtype->processfee($processfee);
         $itemtype->notforloan($notforloan);
@@ -104,11 +129,16 @@ if ( $op eq 'add_form' ) {
         $itemtype->sip_media_type($sip_media_type);
         $itemtype->hideinopac($hideinopac);
         $itemtype->searchcategory($searchcategory);
+        $itemtype->rentalcharge_daily_calendar($rentalcharge_daily_calendar);
+        $itemtype->rentalcharge_hourly_calendar($rentalcharge_hourly_calendar);
 
-        eval { $itemtype->store; };
+        eval {
+          $itemtype->store;
+          $itemtype->replace_library_limits( \@branches );
+        };
 
         if ($@) {
-            push @messages, { type => 'error', code => 'error_on_update' };
+            push @messages, { type => 'alert', code => 'error_on_update' };
         } else {
             push @messages, { type => 'message', code => 'success_on_update' };
         }
@@ -117,8 +147,10 @@ if ( $op eq 'add_form' ) {
             {
                 itemtype            => $itemtype_code,
                 description         => $description,
+                parent_type         => $parent_type,
                 rentalcharge        => $rentalcharge,
-                rental_charge_daily => $rental_charge_daily,
+                rentalcharge_daily  => $rentalcharge_daily,
+                rentalcharge_hourly => $rentalcharge_hourly,
                 defaultreplacecost  => $defaultreplacecost,
                 processfee          => $processfee,
                 notforloan          => $notforloan,
@@ -129,18 +161,23 @@ if ( $op eq 'add_form' ) {
                 sip_media_type      => $sip_media_type,
                 hideinopac          => $hideinopac,
                 searchcategory      => $searchcategory,
+                rentalcharge_daily_calendar  => $rentalcharge_daily_calendar,
+                rentalcharge_hourly_calendar => $rentalcharge_hourly_calendar,
             }
         );
-        eval { $itemtype->store; };
+        eval {
+          $itemtype->store;
+          $itemtype->replace_library_limits( \@branches );
+        };
 
         if ($@) {
-            push @messages, { type => 'error', code => 'error_on_insert' };
+            push @messages, { type => 'alert', code => 'error_on_insert' };
         } else {
             push @messages, { type => 'message', code => 'success_on_insert' };
         }
     } else {
         push @messages,
-          { type => 'error',
+          { type => 'alert',
             code => 'already_exists',
           };
     }
@@ -152,7 +189,7 @@ if ( $op eq 'add_form' ) {
     my $itemtype = Koha::ItemTypes->find($itemtype_code);
     my $can_be_deleted = $itemtype->can_be_deleted();
     if ($can_be_deleted == 0) {
-        push @messages, { type => 'error', code => 'cannot_be_deleted'};
+        push @messages, { type => 'alert', code => 'cannot_be_deleted'};
         $op = 'list';
     } else {
         $template->param( itemtype => $itemtype, );
@@ -163,7 +200,7 @@ if ( $op eq 'add_form' ) {
     my $itemtype = Koha::ItemTypes->find($itemtype_code);
     my $deleted = eval { $itemtype->delete };
     if ( $@ or not $deleted ) {
-        push @messages, { type => 'error', code => 'error_on_delete' };
+        push @messages, { type => 'alert', code => 'error_on_delete' };
     } else {
         push @messages, { type => 'message', code => 'success_on_delete' };
     }
@@ -172,9 +209,9 @@ if ( $op eq 'add_form' ) {
 }
 
 if ( $op eq 'list' ) {
-    my $itemtypes = Koha::ItemTypes->search;
+    my @itemtypes = Koha::ItemTypes->search->as_list;
     $template->param(
-        itemtypes => $itemtypes,
+        itemtypes => \@itemtypes,
         messages  => \@messages,
     );
 }