Bug 28774: Don't store blank values for rental discount

[koha-ffzg.git] / Koha / Items.pm

diff --git a/Koha/Items.pm b/Koha/Items.pm
index 06571e5..193e6e5 100644 (file)
--- a/Koha/Items.pm
+++ b/Koha/Items.pm
@@ -19,7 +19,6 @@ package Koha::Items;
 
 use Modern::Perl;
 
-use Carp;
 
 use Koha::Database;
 
@@ -27,6 +26,8 @@ use Koha::Item;
 
 use base qw(Koha::Objects);
 
+use Koha::SearchEngine::Indexer;
+
 =head1 NAME
 
 Koha::Items - Koha Item object set class
@@ -37,17 +38,17 @@ Koha::Items - Koha Item object set class
 
 =cut
 
-=head3 filter_by_for_loan
+=head3 filter_by_for_hold
 
-$items->filter_by_not_for_loan;
+    my $filtered_items = $items->filter_by_for_hold;
 
-Return the items of the set that are not for loan
+Return the items of the set that are holdable
 
 =cut
 
-sub filter_by_for_loan {
+sub filter_by_for_hold {
     my ($self) = @_;
-    return $self->search( { notforloan => [ 0, undef ] } );
+    return $self->search( { notforloan => { '<=' => 0 } } ); # items with negative or zero notforloan value are holdable
 }
 
 =head3 filter_by_visible_in_opac
@@ -61,7 +62,8 @@ sub filter_by_for_loan {
 Returns a new resultset, containing those items that are not expected to be hidden in OPAC
 for the passed I<Koha::Patron> object that is passed.
 
-The I<OpacHiddenItems> and I<hidelostitems> system preferences are honoured.
+The I<OpacHiddenItems>, I<hidelostitems> and I<OpacHiddenItemsExceptions> system preferences
+are honoured.
 
 =cut
 
@@ -72,8 +74,17 @@ sub filter_by_visible_in_opac {
 
     my $result = $self;
 
+    # Filter out OpacHiddenItems unless disabled by OpacHiddenItemsExceptions
     unless ( $patron and $patron->category->override_hidden_items ) {
-        $result = $result->filter_out_opachiddenitems;
+        my $rules = C4::Context->yaml_preference('OpacHiddenItems') // {};
+
+        my $rules_params;
+        foreach my $field ( keys %$rules ) {
+            $rules_params->{$field} =
+              [ { '-not_in' => $rules->{$field} }, undef ];
+        }
+
+        $result = $result->search( $rules_params );
     }
 
     if (C4::Context->preference('hidelostitems')) {
@@ -83,44 +94,45 @@ sub filter_by_visible_in_opac {
     return $result;
 }
 
-=head3 filter_out_opachiddenitems
+=head3 filter_out_lost
 
-    my $filered_items = $items->filter_out_opachiddenitems;
+    my $filered_items = $items->filter_out_lost;
 
-Returns a new resultset, containing those items that are not expected to be hidden in OPAC.
-The I<OpacHiddenItems> system preference is honoured.
+Returns a new resultset, containing those items that are not marked as lost.
 
 =cut
 
-sub filter_out_opachiddenitems {
+sub filter_out_lost {
     my ($self) = @_;
 
-    my $rules = C4::Context->yaml_preference('OpacHiddenItems') // {};
-
-    my $rules_params;
-    foreach my $field (keys %$rules){
-        $rules_params->{$field}->{'-not_in'} = $rules->{$field};
-    }
+    my $params = { itemlost => 0 };
 
-    return $self->search( $rules_params );
+    return $self->search( $params );
 }
 
-=head3 filter_out_lost
+=head3 move_to_biblio
 
-    my $filered_items = $items->filter_out_lost;
+ $items->move_to_biblio($to_biblio);
 
-Returns a new resultset, containing those items that are not marked as lost.
+Move items to a given biblio.
 
 =cut
 
-sub filter_out_lost {
-    my ($self) = @_;
+sub move_to_biblio {
+    my ( $self, $to_biblio ) = @_;
 
-    my $params = { itemlost => 0 };
-
-    return $self->search( $params );
+    my $biblionumbers = { $to_biblio->biblionumber => 1 };
+    while ( my $item = $self->next() ) {
+        $biblionumbers->{ $item->biblionumber } = 1;
+        $item->move_to_biblio( $to_biblio, { skip_record_index => 1 } );
+    }
+    my $indexer = Koha::SearchEngine::Indexer->new({ index => $Koha::SearchEngine::BIBLIOS_INDEX });
+    for my $biblionumber ( keys %{$biblionumbers} ) {
+        $indexer->index_records( $biblionumber, "specialUpdate", "biblioserver" );
+    }
 }
 
+
 =head2 Internal methods
 
 =head3 _type
@@ -142,6 +154,8 @@ sub object_class {
 =head1 AUTHOR
 
 Kyle M Hall <kyle@bywatersolutions.com>
+Tomas Cohen Arazi <tomascohen@theke.io>
+Martin Renvoize <martin.renvoize@ptfs-europe.com>
 
 =cut