use Koha::DateUtils;
use Koha::Checkouts;
use Koha::Holds;
+use Koha::IssuingRules;
use Koha::Items;
use Koha::ItemTypes;
use Koha::Libraries;
}
);
-my $multihold = $input->param('multi_hold');
-$template->param(multi_hold => $multihold);
my $showallitems = $input->param('showallitems');
my $itemtypes = { map { $_->{itemtype} => $_ } @{ Koha::ItemTypes->search_with_localization->unblessed } };
AlterPriority( $where, $reserve_id );
} elsif ( $action eq 'cancel' ) {
my $reserve_id = $input->param('reserve_id');
- CancelReserve({ reserve_id => $reserve_id });
+ my $hold = Koha::Holds->find( $reserve_id );
+ $hold->cancel if $hold;
} elsif ( $action eq 'setLowestPriority' ) {
my $reserve_id = $input->param('reserve_id');
ToggleLowestPriority( $reserve_id );
}
my @biblionumbers = ();
+my $biblionumber = $input->param('biblionumber');
my $biblionumbers = $input->param('biblionumbers');
-if ($multihold) {
+if ( $biblionumbers ) {
@biblionumbers = split '/', $biblionumbers;
} else {
push @biblionumbers, $input->multi_param('biblionumber');
}
+# 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'));
# If we have the borrowernumber because we've performed an action, then we
# don't want to try to place another reserve.
$diffbranch = 1;
}
- my $is_debarred = $patron->is_debarred;
+ my $amount_outstanding = $patron->account->balance;
$template->param(
- borrowernumber => $patron->borrowernumber,
- borrowersurname => $patron->surname,
- borrowerfirstname => $patron->firstname,
- borrowerstreetaddress => $patron->address,
- borrowercity => $patron->city,
- borrowerphone => $patron->phone,
- borrowermobile => $patron->mobile,
- borrowerfax => $patron->fax,
- borrowerphonepro => $patron->phonepro,
- borroweremail => $patron->email,
- borroweremailpro => $patron->emailpro,
- cardnumber => $patron->cardnumber,
+ patron => $patron,
expiry => $expiry,
diffbranch => $diffbranch,
messages => $messages,
warnings => $warnings,
- restricted => $is_debarred,
- amount_outstanding => GetMemberAccountRecords($patron->borrowernumber),
+ amount_outstanding => $amount_outstanding,
);
}
if ( $patron ) {
{ # CanBookBeReserved
my $canReserve = CanBookBeReserved( $patron->borrowernumber, $biblionumber );
- $canReserve //= '';
- if ( $canReserve eq 'OK' ) {
+ $canReserve->{status} //= '';
+ if ( $canReserve->{status} eq 'OK' ) {
#All is OK and we can continue
}
- elsif ( $canReserve eq 'tooManyReserves' ) {
+ elsif ( $canReserve->{status} eq 'tooManyReserves' ) {
$exceeded_maxreserves = 1;
+ $template->param( maxreserves => $canReserve->{limit} );
}
- elsif ( $canReserve eq 'tooManyHoldsForThisRecord' ) {
+ elsif ( $canReserve->{status} eq 'tooManyHoldsForThisRecord' ) {
$exceeded_holds_per_record = 1;
- $biblioloopiter{$canReserve} = 1;
+ $biblioloopiter{ $canReserve->{status} } = 1;
}
- elsif ( $canReserve eq 'ageRestricted' ) {
- $template->param( $canReserve => 1 );
- $biblioloopiter{$canReserve} = 1;
+ elsif ( $canReserve->{status} eq 'ageRestricted' ) {
+ $template->param( $canReserve->{status} => 1 );
+ $biblioloopiter{ $canReserve->{status} } = 1;
}
else {
- $biblioloopiter{$canReserve} = 1;
+ $biblioloopiter{ $canReserve->{status} } = 1;
}
}
{ # 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
- my $alreadypossession;
if ( !C4::Context->preference('AllowHoldsOnPatronsPossessions')
&& CheckIfIssuedToPatron( $patron->borrowernumber, $biblionumber ) )
{
- $template->param( alreadypossession => $alreadypossession, );
+ $template->param( alreadypossession => 1, );
}
}
}
## Should be same as biblionumber
my @biblioitemnumbers = keys %itemnumbers_of_biblioitem;
- ## Hash of biblioitemnumber to 'biblioitem' table records
- my $biblioiteminfos_of = GetBiblioItemInfosOf(@biblioitemnumbers);
+ my $biblioiteminfos_of = {
+ map {
+ my $biblioitem = $_;
+ ( $biblioitem->{biblioitemnumber} => $biblioitem )
+ } @{ Koha::Biblioitems->search(
+ { biblioitemnumber => { -in => \@biblioitemnumbers } },
+ { select => ['biblioitemnumber', 'publicationyear', 'itemtype']}
+ )->unblessed
+ }
+ };
my $frameworkcode = GetFrameworkCode( $biblionumber );
my @notforloan_avs = Koha::AuthorisedValues->search_by_koha_field({ kohafield => 'items.notforloan', frameworkcode => $frameworkcode });
}
# checking reserve
- my $holds = Koha::Items->find( $itemnumber )->current_holds;
+ my $item_object = Koha::Items->find( $itemnumber );
+ my $holds = $item_object->current_holds;
if ( my $first_hold = $holds->next ) {
my $p = Koha::Patrons->find( $first_hold->borrowernumber );
$item->{backgroundcolor} = 'reserved';
$item->{reservedate} = output_pref({ dt => dt_from_string( $first_hold->reservedate ), dateonly => 1 }); # FIXME Should be formatted in the template
- $item->{ReservedForBorrowernumber} = $p->borrowernumber;
- $item->{ReservedForSurname} = $p->surname;
- $item->{ReservedForFirstname} = $p->firstname;
+ $item->{ReservedFor} = $p;
$item->{ExpectedAtLibrary} = $first_hold->branchcode;
$item->{waitingdate} = $first_hold->waitingdate;
}
$item->{'holdallowed'} = $branchitemrule->{'holdallowed'};
my $can_item_be_reserved = CanItemBeReserved( $patron->borrowernumber, $itemnumber );
- $item->{not_holdable} = $can_item_be_reserved unless ( $can_item_be_reserved eq 'OK' );
+ $item->{not_holdable} = $can_item_be_reserved->{status} unless ( $can_item_be_reserved->{status} eq 'OK' );
- $item->{item_level_holds} = OPACItemHoldsAllowed( $item, $patron_unblessed);
+ $item->{item_level_holds} = Koha::IssuingRules->get_opacitemholds_policy( { item => $item_object, patron => $patron } );
if (
!$item->{cantreserve}
&& !$exceeded_maxreserves
&& IsAvailableForItemLevelRequest($item, $patron_unblessed)
- && $can_item_be_reserved eq 'OK'
+ && $can_item_be_reserved->{status} eq 'OK'
)
{
$item->{available} = 1;
push( @available_itemtypes, $item->{itype} );
}
- elsif ( C4::Context->preference('AllowHoldPolicyOverride') ) {
+ elsif ( $can_item_be_reserved->{status} eq 'tooManyReserves' && C4::Context->preference('AllowHoldPolicyOverride') ) {
# If AllowHoldPolicyOverride is set, it should override EVERY restriction, not just branch item rules
$item->{override} = 1;
$num_override++;
+
+ push( @available_itemtypes, $item->{itype} );
}
# If none of the conditions hold true, then neither override nor available is set and the item cannot be checked
}
}
- # get borrowers reserve info
- if ( C4::Context->preference('HidePatronName') ) {
- $reserve{'hidename'} = 1;
- $reserve{'cardnumber'} = $res->borrower()->cardnumber();
- }
$reserve{'expirationdate'} = output_pref( { dt => dt_from_string( $res->expirationdate ), dateonly => 1 } )
unless ( !defined( $res->expirationdate ) || $res->expirationdate eq '0000-00-00' );
$reserve{'date'} = output_pref( { dt => dt_from_string( $res->reservedate ), dateonly => 1 } );
$reserve{'borrowernumber'} = $res->borrowernumber();
$reserve{'biblionumber'} = $res->biblionumber();
- $reserve{'borrowernumber'} = $res->borrowernumber();
- $reserve{'firstname'} = $res->borrower()->firstname();
- $reserve{'surname'} = $res->borrower()->surname();
+ $reserve{'patron'} = $res->borrower;
$reserve{'notes'} = $res->reservenotes();
$reserve{'waiting_date'} = $res->waitingdate();
$reserve{'ccode'} = $res->item() ? $res->item()->ccode() : undef;
holdsview => 1,
C4::Search::enabled_staff_search_views,
);
- if ( $patron ) {
- $template->param( borrower_branchcode => $patron->branchcode );
- }
$biblioloopiter{biblionumber} = $biblionumber;
$biblioloopiter{title} = $biblio->title;
$template->param( exceeded_maxreserves => $exceeded_maxreserves );
$template->param( exceeded_holds_per_record => $exceeded_holds_per_record );
-if ($multihold) {
- $template->param( multi_hold => 1 );
-}
-
if ( C4::Context->preference( 'AllowHoldDateInFuture' ) ) {
$template->param( reserve_in_future => 1 );
}
projects / koha.git / blobdiff