use C4::Biblio;
use C4::Items;
use C4::Koha;
+use C4::Serials;
use C4::Circulation;
use Koha::DateUtils;
use C4::Utils::DataTables::Members;
}
);
-my $multihold = $input->param('multi_hold');
-$template->param(multi_hold => $multihold);
my $showallitems = $input->param('showallitems');
+my $pickup = $input->param('pickup') || C4::Context->userenv->{'branch'};
my $itemtypes = { map { $_->{itemtype} => $_ } @{ Koha::ItemTypes->search_with_localization->unblessed } };
$action ||= q{};
if ( $action eq 'move' ) {
- my $where = $input->param('where');
- my $reserve_id = $input->param('reserve_id');
- AlterPriority( $where, $reserve_id );
+ my $where = $input->param('where');
+ my $reserve_id = $input->param('reserve_id');
+ my $prev_priority = $input->param('prev_priority');
+ my $next_priority = $input->param('next_priority');
+ my $first_priority = $input->param('first_priority');
+ my $last_priority = $input->param('last_priority');
+ my $hold_itemnumber = $input->param('itemnumber');
+ if ( $prev_priority == 0 && $next_priority == 1 ){
+ C4::Reserves::RevertWaitingStatus({ itemnumber => $hold_itemnumber });
+ } else {
+ AlterPriority( $where, $reserve_id, $prev_priority, $next_priority, $first_priority, $last_priority );
+ }
} elsif ( $action eq 'cancel' ) {
my $reserve_id = $input->param('reserve_id');
my $hold = Koha::Holds->find( $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,
);
}
my $logged_in_patron = Koha::Patrons->find( $borrowernumber );
my $itemdata_enumchron = 0;
+my $itemdata_ccode = 0;
my @biblioloop = ();
foreach my $biblionumber (@biblionumbers) {
next unless $biblionumber =~ m|^\d+$|;
my $force_hold_level;
if ( $patron ) {
{ # CanBookBeReserved
- my $canReserve = CanBookBeReserved( $patron->borrowernumber, $biblionumber );
- $canReserve //= '';
- if ( $canReserve eq 'OK' ) {
+ my $canReserve = CanBookBeReserved( $patron->borrowernumber, $biblionumber, $pickup );
+ 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;
}
}
## 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 });
$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;
}
# for branches they arent logged in to
if ( C4::Context->preference("IndependentBranches") ) {
if (! C4::Context->preference("canreservefromotherbranches")){
- # cant reserve items so need to check if item homebranch and userenv branch match if not we cant reserve
+ # can't reserve items so need to check if item homebranch and userenv branch match if not we can't reserve
my $userenv = C4::Context->userenv;
unless ( C4::Context->IsSuperLibrarian ) {
$item->{cantreserve} = 1 if ( $item->{homebranch} ne $userenv->{branch} );
$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' );
+ my $can_item_be_reserved = CanItemBeReserved( $patron->borrowernumber, $itemnumber, $pickup );
+ $item->{not_holdable} = $can_item_be_reserved->{status} unless ( $can_item_be_reserved->{status} eq 'OK' );
$item->{item_level_holds} = Koha::IssuingRules->get_opacitemholds_policy( { item => $item_object, patron => $patron } );
!$item->{cantreserve}
&& !$exceeded_maxreserves
&& IsAvailableForItemLevelRequest($item, $patron_unblessed)
- && $can_item_be_reserved eq 'OK'
+ && $can_item_be_reserved->{status} eq 'OK'
)
{
$item->{available} = 1;
if ($item->{enumchron}) {
$itemdata_enumchron = 1;
}
+ # Show collection when needed
+ if ($item->{ccode}) {
+ $itemdata_ccode = 1;
+ }
}
push @{ $biblioitem->{itemloop} }, $item;
}
}
- # 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;
$reserve{'reserve_id'} = $res->reserve_id();
$reserve{itemtype} = $res->itemtype();
$reserve{branchcode} = $res->branchcode();
+ $reserve{object} = $res;
push( @reserveloop, \%reserve );
}
optionloop => \@optionloop,
bibitemloop => \@bibitemloop,
itemdata_enumchron => $itemdata_enumchron,
+ itemdata_ccode => $itemdata_ccode,
date => $date,
biblionumber => $biblionumber,
findborrower => $findborrower,
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( biblionumbers => $biblionumbers );
$template->param( exceeded_maxreserves => $exceeded_maxreserves );
$template->param( exceeded_holds_per_record => $exceeded_holds_per_record );
-
-if ($multihold) {
- $template->param( multi_hold => 1 );
-}
+$template->param( subscriptionsnumber => CountSubscriptionFromBiblionumber($biblionumber));
+$template->param( pickup => $pickup );
if ( C4::Context->preference( 'AllowHoldDateInFuture' ) ) {
$template->param( reserve_in_future => 1 );
projects / koha.git / blobdiff