use Modern::Perl;
use CGI qw ( -utf8 );
-use List::MoreUtils qw/uniq/;
-use Date::Calc qw/Date_to_Days/;
-use C4::Output;
-use C4::Auth;
-use C4::Reserves;
-use C4::Biblio;
-use C4::Items;
-use C4::Koha;
-use C4::Serials;
-use C4::Circulation;
-use Koha::DateUtils;
+use List::MoreUtils qw( uniq );
+use Date::Calc qw( Date_to_Days );
+use C4::Output qw( output_html_with_http_headers );
+use C4::Auth qw( get_template_and_user );
+use C4::Reserves qw( RevertWaitingStatus AlterPriority ToggleLowestPriority ToggleSuspend CanBookBeReserved GetMaxPatronHoldsForRecord ItemsAnyAvailableAndNotRestricted CanItemBeReserved IsAvailableForItemLevelRequest );
+use C4::Items qw( get_hostitemnumbers_of );
+use C4::Koha qw( getitemtypeimagelocation );
+use C4::Serials qw( CountSubscriptionFromBiblionumber );
+use C4::Circulation qw( GetTransfers _GetCircControlBranch GetBranchItemRule );
+use Koha::DateUtils qw( dt_from_string output_pref );
use C4::Utils::DataTables::Members;
-use C4::Members;
-use C4::Search; # enabled_staff_search_views
+use C4::Search qw( enabled_staff_search_views );
use Koha::Biblios;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string output_pref );
use Koha::Checkouts;
use Koha::Holds;
-use Koha::IssuingRules;
+use Koha::CirculationRules;
use Koha::Items;
use Koha::ItemTypes;
use Koha::Libraries;
use Koha::Clubs;
my $dbh = C4::Context->dbh;
-my $input = new CGI;
+my $input = CGI->new;
my ( $template, $borrowernumber, $cookie, $flags ) = get_template_and_user(
{
template_name => "reserve/request.tt",
query => $input,
type => "intranet",
- authnotrequired => 0,
flagsrequired => { reserveforothers => 'place_holds' },
}
);
my $showallitems = $input->param('showallitems');
-my $pickup = $input->param('pickup') || C4::Context->userenv->{'branch'};
+my $pickup = $input->param('pickup');
my $itemtypes = { map { $_->{itemtype} => $_ } @{ Koha::ItemTypes->search_with_localization->unblessed } };
}
} elsif ( $action eq 'cancel' ) {
my $reserve_id = $input->param('reserve_id');
+ my $cancellation_reason = $input->param("cancellation-reason");
my $hold = Koha::Holds->find( $reserve_id );
- $hold->cancel if $hold;
+ $hold->cancel({ cancellation_reason => $cancellation_reason }) if $hold;
} elsif ( $action eq 'setLowestPriority' ) {
my $reserve_id = $input->param('reserve_id');
ToggleLowestPriority( $reserve_id );
push @biblionumbers, $input->multi_param('biblionumber');
}
-my $multihold = scalar $input->param('multi_hold');
-# FIXME multi_hold should not be a variable but depends on the number of elements in @biblionumbers
-$template->param(multi_hold => scalar $input->param('multi_hold'));
+my $multi_hold = @biblionumbers > 1;
+$template->param(
+ multi_hold => $multi_hold,
+);
# If we have the borrowernumber because we've performed an action, then we
# don't want to try to place another reserve.
my $new_reserves_count = scalar( @biblionumbers );
my $maxreserves = C4::Context->preference('maxreserves');
+ $template->param( maxreserves => $maxreserves );
+
if ( $maxreserves
&& ( $reserves_count + $new_reserves_count > $maxreserves ) )
{
# we check the date expiry of the borrower (only if there is an expiry date, otherwise, set to 1 (warn)
my $expiry_date = $patron->dateexpiry;
my $expiry = 0; # flag set if patron account has expired
- if ($expiry_date and $expiry_date ne '0000-00-00' and
+ if ($expiry_date and
Date_to_Days(split /-/,$date) > Date_to_Days(split /-/,$expiry_date)) {
$expiry = 1;
}
}
my $expiry_date = $enrollment->patron->dateexpiry;
$member->{expiry} = 0; # flag set if patron account has expired
- if ($expiry_date and $expiry_date ne '0000-00-00' and
+ if ($expiry_date and
Date_to_Days(split /-/,$date) > Date_to_Days(split /-/,$expiry_date)) {
$member->{expiry} = 1;
}
);
}
+unless ( $club_hold or $borrowernumber_hold ) {
+ $template->param( clubcount => Koha::Clubs->search->count );
+}
+
$template->param(
messageborrower => $messageborrower,
messageclub => $messageclub
# FIXME launch another time GetMember perhaps until (Joubu: Why?)
my $patron = Koha::Patrons->find( $borrowernumber_hold );
+if ( $patron && $multi_hold ) {
+ my @multi_pickup_locations =
+ Koha::Biblios->search( { biblionumber => \@biblionumbers } )
+ ->pickup_locations( { patron => $patron } );
+ $template->param( multi_pickup_locations => \@multi_pickup_locations );
+}
+
my $logged_in_patron = Koha::Patrons->find( $borrowernumber );
my $wants_check;
my $itemdata_enumchron = 0;
my $itemdata_ccode = 0;
my @biblioloop = ();
+my $no_reserves_allowed = 0;
foreach my $biblionumber (@biblionumbers) {
next unless $biblionumber =~ m|^\d+$|;
#All is OK and we can continue
}
+ elsif ( $canReserve->{status} eq 'noReservesAllowed' || $canReserve->{status} eq 'notReservable' ) {
+ $no_reserves_allowed = 1;
+ }
elsif ( $canReserve->{status} eq 'tooManyReserves' ) {
$exceeded_maxreserves = 1;
$template->param( maxreserves => $canReserve->{limit} );
$template->param( $canReserve->{status} => 1 );
$biblioloopiter{ $canReserve->{status} } = 1;
}
+ elsif ( $canReserve->{status} eq 'alreadypossession' ) {
+ $template->param( $canReserve->{status} => 1);
+ $biblioloopiter{ $canReserve->{status} } = 1;
+ }
else {
$biblioloopiter{ $canReserve->{status} } = 1;
}
$biblioloopiter{remaining_holds_for_record} = $max_holds_for_record;
$template->param( max_holds_for_record => $max_holds_for_record );
$template->param( remaining_holds_for_record => $remaining_holds_for_record );
-
- { # alreadypossession
- # Check to see if patron is allowed to place holds on records where the
- # patron already has an item from that record checked out
- if ( !C4::Context->preference('AllowHoldsOnPatronsPossessions')
- && CheckIfIssuedToPatron( $patron->borrowernumber, $biblionumber ) )
- {
- $template->param( alreadypossession => 1, );
- }
- }
}
my $num_available = 0;
my $num_override = 0;
my $hiddencount = 0;
+ my $num_alreadyheld = 0;
$biblioitem->{force_hold_level} = $force_hold_level;
$itemtypes->{ $biblioitem->{itemtype} }{imageurl} );
}
+ # iterating through all items first to check if any of them available
+ # to pass this value further inside down to IsAvailableForItemLevelRequest to
+ # it's complicated logic to analyse.
+ # (before this loop was inside that sub loop so it was O(n^2) )
+ my $items_any_available;
+
+ $items_any_available = ItemsAnyAvailableAndNotRestricted( { biblionumber => $biblioitemnumber, patron => $patron })
+ if $patron;
+
foreach my $itemnumber ( @{ $itemnumbers_of_biblioitem{$biblioitemnumber} } ) {
my $item = $iteminfos_of->{$itemnumber};
my $do_check;
$do_check = $patron->do_check_for_previous_checkout($item) if $wants_check;
if ( $do_check && $wants_check ) {
$item->{checked_previously} = $do_check;
- if ( $multihold ) {
+ if ( $multi_hold ) {
$biblioloopiter{checked_previously} = $do_check;
} else {
$template->param( checked_previously => $do_check );
$item->{'holdallowed'} = $branchitemrule->{'holdallowed'};
my $can_item_be_reserved = CanItemBeReserved( $patron->borrowernumber, $itemnumber )->{status};
- $item->{not_holdable} = $can_item_be_reserved unless ( $can_item_be_reserved->{status} eq 'OK' );
+ $item->{not_holdable} = $can_item_be_reserved unless ( $can_item_be_reserved eq 'OK' );
- $item->{item_level_holds} = Koha::IssuingRules->get_opacitemholds_policy( { item => $item_object, patron => $patron } );
+ $item->{item_level_holds} = Koha::CirculationRules->get_opacitemholds_policy( { item => $item_object, patron => $patron } );
if (
!$item->{cantreserve}
&& !$exceeded_maxreserves
- && IsAvailableForItemLevelRequest($item_object, $patron)
&& $can_item_be_reserved eq 'OK'
+ # items_any_available defined outside of the current loop,
+ # so we avoiding loop inside IsAvailableForItemLevelRequest:
+ && IsAvailableForItemLevelRequest($item_object, $patron, undef, $items_any_available)
)
{
- $item->{available} = 1;
- $num_available++;
- if($branchitemrule->{'hold_fulfillment_policy'} eq 'any' ) {
- $item->{pickup_locations} = 'Any library';
- } else {
- $item->{pickup_locations} = join (', ', map { $_->{branchname} } Koha::Items->find($itemnumber)->pickup_locations({ patron => $patron }));
+ # Send the pickup locations count to the UI, the pickup locations will be pulled using the API
+ my $pickup_locations = $item_object->pickup_locations({ patron => $patron });
+ $item->{pickup_locations_count} = $pickup_locations->count;
+ if ( $item->{pickup_locations_count} > 0 ) {
+ $num_available++;
+ $item->{available} = 1;
+ # pass the holding branch for use as default
+ my $default_pickup_location = $pickup_locations->search({ branchcode => $item->{holdingbranch} })->next;
+ $item->{default_pickup_location} = $default_pickup_location;
+ }
+ else {
+ $item->{available} = 0;
+ $item->{not_holdable} = "no_valid_pickup_location";
}
push( @available_itemtypes, $item->{itype} );
if ( $can_item_be_reserved ne 'itemAlreadyOnHold' ) {
$item->{override} = 1;
$num_override++;
- }
+ } else { $num_alreadyheld++ }
push( @available_itemtypes, $item->{itype} );
}
push @{ $biblioitem->{itemloop} }, $item;
}
- if ( $num_override == scalar( @{ $biblioitem->{itemloop} } ) ) { # That is, if all items require an override
+ # While we can't override an alreay held item, we should be able to override the others
+ # Unless all items are already held
+ if ( $num_override > 0 && ($num_override + $num_alreadyheld) == scalar( @{ $biblioitem->{itemloop} } ) ) {
+ # That is, if all items require an override
$template->param( override_required => 1 );
} elsif ( $num_available == 0 ) {
$template->param( none_available => 1 );
$reserve{'wbrcode'} = $res->branchcode();
$reserve{'itemnumber'} = $res->itemnumber();
$reserve{'wbrname'} = $res->branch()->branchname();
-
- if ( $reserve{'holdingbranch'} eq $reserve{'wbrcode'} ) {
-
- # Just because the holdingbranch matches the reserve branch doesn't mean the item
- # has arrived at the destination, check for an open transfer for the item as well
- my ( $transfertwhen, $transfertfrom, $transferto ) =
- C4::Circulation::GetTransfers( $res->itemnumber() );
- if ( not $transferto or $transferto ne $res->branchcode() ) {
- $reserve{'atdestination'} = 1;
- }
- }
-
- # set found to 1 if reserve is waiting for patron pickup
+ $reserve{'atdestination'} = $res->is_at_destination();
+ $reserve{'desk_name'} = ( $res->desk() ) ? $res->desk()->desk_name() : '' ;
$reserve{'found'} = $res->is_found();
+ $reserve{'inprocessing'} = $res->is_in_processing();
$reserve{'intransit'} = $res->is_in_transit();
}
elsif ( $res->priority() > 0 ) {
$reserve{'reserve_id'} = $res->reserve_id();
$reserve{itemtype} = $res->itemtype();
$reserve{branchcode} = $res->branchcode();
+ $reserve{non_priority} = $res->non_priority();
$reserve{object} = $res;
push( @reserveloop, \%reserve );
$template->param( reserveloop => \@reserveloop );
}
+ if ( $patron ) {
+ # Add the valid pickup locations
+ my @pickup_locations = $biblio->pickup_locations({ patron => $patron });
+ $biblioloopiter{pickup_locations} = \@pickup_locations;
+ $biblioloopiter{pickup_locations_codes} = [ map { $_->branchcode } @pickup_locations ];
+ }
+
push @biblioloop, \%biblioloopiter;
}
$template->param( biblioloop => \@biblioloop );
$template->param( biblionumbers => $biblionumbers );
+$template->param( no_reserves_allowed => $no_reserves_allowed );
$template->param( exceeded_maxreserves => $exceeded_maxreserves );
$template->param( exceeded_holds_per_record => $exceeded_holds_per_record );
$template->param( subscriptionsnumber => CountSubscriptionFromBiblionumber($biblionumber));
-$template->param( pickup => $pickup );
+
+# pass the userenv branch if no pickup location selected
+$template->param( pickup => $pickup || C4::Context->userenv->{branch} );
if ( C4::Context->preference( 'AllowHoldDateInFuture' ) ) {
$template->param( reserve_in_future => 1 );
projects / srvgit / blobdiff