use C4::Context;
use C4::Search;
use C4::Items;
-use C4::Branch;
use C4::Circulation;
use C4::Members;
use C4::Biblio;
use Koha::DateUtils;
+use Koha::Items;
+use Koha::Patrons;
use List::Util qw(shuffle);
use List::MoreUtils qw(any);
use Data::Dumper;
-use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
+use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
BEGIN {
- $VERSION = 3.03;
require Exporter;
@ISA = qw(Exporter);
@EXPORT_OK = qw(
my $sth = $dbh->prepare("INSERT INTO transport_cost (frombranch, tobranch, cost, disable_transfer) VALUES (?, ?, ?, ?)");
- $dbh->do("TRUNCATE TABLE transport_cost");
+ $dbh->do("DELETE FROM transport_cost");
foreach (@$records) {
my $cost = $_->{cost};
my $from = $_->{frombranch};
$cost ||= 0;
}
elsif ( !defined ($cost) || ($cost !~ m/(0|[1-9][0-9]*)(\.[0-9]*)?/o) ) {
- warn "Invalid $from -> $to cost $cost - must be a number >= 0, disablig";
+ warn "Invalid $from -> $to cost $cost - must be a number >= 0, disabling";
$cost = 0;
$_->{disable_transfer} = 1;
}
$sth->execute(@bind_params);
my $items = [];
while ( my $row = $sth->fetchrow_hashref ){
- my $record = GetMarcBiblio($row->{biblionumber});
+ my $record = GetMarcBiblio({ biblionumber => $row->{biblionumber} });
if ($record){
$row->{subtitle} = [ map { $_->{subfield} } @{ GetRecordValue( 'subtitle', $record, '' ) } ];
$row->{parts} = GetRecordValue('parts',$record,'')->[0]->{subfield};
my $dbh = C4::Context->dbh;
my $request_query = "SELECT biblionumber, borrowernumber, itemnumber, priority, reserves.branchcode,
- reservedate, reservenotes, borrowers.branchcode AS borrowerbranch
+ reservedate, reservenotes, borrowers.branchcode AS borrowerbranch, itemtype, timestamp
FROM reserves
JOIN borrowers USING (borrowernumber)
WHERE biblionumber = ?
return [ grep {
my $rule = GetBranchItemRule($_->{homebranch}, $_->{itype});
$_->{holdallowed} = $rule->{holdallowed};
+ $_->{hold_fulfillment_policy} = $rule->{hold_fulfillment_policy};
} @items ];
}
grep { defined($_->{itemnumber}) }
@$hold_requests;
+ map { $_->{_object} = Koha::Items->find( $_->{itemnumber} ) } @$available_items;
+ my $libraries = {};
+ map { $libraries->{$_->id} = $_ } Koha::Libraries->search();
+
# group available items by itemnumber
my %items_by_itemnumber = map { $_->{itemnumber} => $_ } @$available_items;
# figure out which item-level requests can be filled
my $num_items_remaining = scalar(@$available_items);
+
+ # Look for Local Holds Priority matches first
+ if ( C4::Context->preference('LocalHoldsPriority') ) {
+ my $LocalHoldsPriorityPatronControl =
+ C4::Context->preference('LocalHoldsPriorityPatronControl');
+ my $LocalHoldsPriorityItemControl =
+ C4::Context->preference('LocalHoldsPriorityItemControl');
+
+ foreach my $request (@$hold_requests) {
+ next if (defined($request->{itemnumber})); #skip item level holds in local priority checking
+ last if $num_items_remaining == 0;
+
+ my $local_hold_match;
+ foreach my $item (@$available_items) {
+ next
+ if ( !$item->{holdallowed} )
+ || ( $item->{holdallowed} == 1
+ && $item->{homebranch} ne $request->{borrowerbranch} );
+
+ next unless $item->{_object}->can_be_transferred( { to => $libraries->{ $request->{branchcode} } } );
+
+ my $local_holds_priority_item_branchcode =
+ $item->{$LocalHoldsPriorityItemControl};
+
+ my $local_holds_priority_patron_branchcode =
+ ( $LocalHoldsPriorityPatronControl eq 'PickupLibrary' )
+ ? $request->{branchcode}
+ : ( $LocalHoldsPriorityPatronControl eq 'HomeLibrary' )
+ ? $request->{borrowerbranch}
+ : undef;
+
+ $local_hold_match =
+ $local_holds_priority_item_branchcode eq
+ $local_holds_priority_patron_branchcode;
+
+ if ($local_hold_match) {
+ if ( exists $items_by_itemnumber{ $item->{itemnumber} }
+ and not exists $allocated_items{ $item->{itemnumber} }
+ and not $request->{allocated})
+ {
+ $item_map{ $item->{itemnumber} } = {
+ borrowernumber => $request->{borrowernumber},
+ biblionumber => $request->{biblionumber},
+ holdingbranch => $item->{holdingbranch},
+ pickup_branch => $request->{branchcode}
+ || $request->{borrowerbranch},
+ item_level => 0,
+ reservedate => $request->{reservedate},
+ timestamp => $request->{timestamp},
+ reservenotes => $request->{reservenotes},
+ };
+ $allocated_items{ $item->{itemnumber} }++;
+ $request->{allocated} = 1;
+ $num_items_remaining--;
+ }
+ }
+ }
+ }
+ }
+
foreach my $request (@$hold_requests) {
last if $num_items_remaining == 0;
+ next if $request->{allocated};
# is this an item-level request?
if (defined($request->{itemnumber})) {
# fill it if possible; if not skip it
- if (exists $items_by_itemnumber{$request->{itemnumber}} and
- not exists $allocated_items{$request->{itemnumber}}) {
- $item_map{$request->{itemnumber}} = {
+ if (
+ exists $items_by_itemnumber{ $request->{itemnumber} }
+ and not exists $allocated_items{ $request->{itemnumber} }
+ and ( # Don't fill item level holds that contravene the hold pickup policy at this time
+ ( $items_by_itemnumber{ $request->{itemnumber} }->{hold_fulfillment_policy} eq 'any' )
+ || ( $request->{branchcode} eq $items_by_itemnumber{ $request->{itemnumber} }->{ $items_by_itemnumber{ $request->{itemnumber} }->{hold_fulfillment_policy} } )
+ and ( !$request->{itemtype} # If hold itemtype is set, item's itemtype must match
+ || $items_by_itemnumber{ $request->{itemnumber} }->{itype} eq $request->{itemtype} )
+ )
+ and $items_by_itemnumber{ $request->{itemnumber} }->{_object}->can_be_transferred( { to => $libraries->{ $request->{branchcode} } } )
+
+ )
+ {
+
+ $item_map{ $request->{itemnumber} } = {
borrowernumber => $request->{borrowernumber},
- biblionumber => $request->{biblionumber},
- holdingbranch => $items_by_itemnumber{$request->{itemnumber}}->{holdingbranch},
- pickup_branch => $request->{branchcode} || $request->{borrowerbranch},
- item_level => 1,
- reservedate => $request->{reservedate},
- reservenotes => $request->{reservenotes},
+ biblionumber => $request->{biblionumber},
+ holdingbranch => $items_by_itemnumber{ $request->{itemnumber} }->{holdingbranch},
+ pickup_branch => $request->{branchcode} || $request->{borrowerbranch},
+ item_level => 1,
+ reservedate => $request->{reservedate},
+ timestamp => $request->{timestamp},
+ reservenotes => $request->{reservenotes},
};
- $allocated_items{$request->{itemnumber}}++;
+ $allocated_items{ $request->{itemnumber} }++;
$num_items_remaining--;
}
} else {
my $pull_branches;
foreach my $request (@$hold_requests) {
last if $num_items_remaining == 0;
+ next if $request->{allocated};
next if defined($request->{itemnumber}); # already handled these
# look for local match first
my $holding_branch_items = $items_by_branch{$pickup_branch};
if ( $holding_branch_items ) {
foreach my $item (@$holding_branch_items) {
- if ( $request->{borrowerbranch} eq $item->{homebranch} ) {
+ next unless $items_by_itemnumber{ $item->{itemnumber} }->{_object}->can_be_transferred( { to => $libraries->{ $request->{branchcode} } } );
+
+ if (
+ $request->{borrowerbranch} eq $item->{homebranch}
+ && ( ( $item->{hold_fulfillment_policy} eq 'any' ) # Don't fill item level holds that contravene the hold pickup policy at this time
+ || $request->{branchcode} eq $item->{ $item->{hold_fulfillment_policy} } )
+ && ( !$request->{itemtype} # If hold itemtype is set, item's itemtype must match
+ || $items_by_itemnumber{ $request->{itemnumber} }->{itype} eq $request->{itemtype} )
+ )
+ {
$itemnumber = $item->{itemnumber};
last;
}
my $holding_branch_items = $items_by_branch{$holdingbranch};
foreach my $item (@$holding_branch_items) {
next if $request->{borrowerbranch} ne $item->{homebranch};
+ next unless $items_by_itemnumber{ $item->{itemnumber} }->{_object}->can_be_transferred( { to => $libraries->{ $request->{branchcode} } } );
+
+ # Don't fill item level holds that contravene the hold pickup policy at this time
+ next unless $item->{hold_fulfillment_policy} eq 'any'
+ || $request->{branchcode} eq $item->{ $item->{hold_fulfillment_policy} };
+
+ # If hold itemtype is set, item's itemtype must match
+ next unless ( !$request->{itemtype}
+ || $item->{itype} eq $request->{itemtype} );
$itemnumber = $item->{itemnumber};
last;
foreach my $item (@$holding_branch_items) {
next if $pickup_branch ne $item->{homebranch};
next if ( $item->{holdallowed} == 1 && $item->{homebranch} ne $request->{borrowerbranch} );
+ next unless $items_by_itemnumber{ $item->{itemnumber} }->{_object}->can_be_transferred( { to => $libraries->{ $request->{branchcode} } } );
+
+ # Don't fill item level holds that contravene the hold pickup policy at this time
+ next unless $item->{hold_fulfillment_policy} eq 'any'
+ || $request->{branchcode} eq $item->{ $item->{hold_fulfillment_policy} };
+
+ # If hold itemtype is set, item's itemtype must match
+ next unless ( !$request->{itemtype}
+ || $item->{itype} eq $request->{itemtype} );
$itemnumber = $item->{itemnumber};
$holdingbranch = $branch;
unless ( $itemnumber ) {
foreach my $current_item ( @{ $items_by_branch{$holdingbranch} } ) {
if ( $holdingbranch && ( $current_item->{holdallowed} == 2 || $request->{borrowerbranch} eq $current_item->{homebranch} ) ) {
+
+ # Don't fill item level holds that contravene the hold pickup policy at this time
+ next unless $current_item->{hold_fulfillment_policy} eq 'any'
+ || $request->{branchcode} eq $current_item->{ $current_item->{hold_fulfillment_policy} };
+
+ # If hold itemtype is set, item's itemtype must match
+ next unless ( !$request->{itemtype}
+ || $current_item->{itype} eq $request->{itemtype} );
+
+ next unless $items_by_itemnumber{ $current_item->{itemnumber} }->{_object}->can_be_transferred( { to => $libraries->{ $request->{branchcode} } } );
+
$itemnumber = $current_item->{itemnumber};
last; # quit this loop as soon as we have a suitable item
}
foreach my $item (@$holding_branch_items) {
next if ( $item->{holdallowed} == 1 && $item->{homebranch} ne $request->{borrowerbranch} );
+ # Don't fill item level holds that contravene the hold pickup policy at this time
+ next unless $item->{hold_fulfillment_policy} eq 'any'
+ || $request->{branchcode} eq $item->{ $item->{hold_fulfillment_policy} };
+
+ # If hold itemtype is set, item's itemtype must match
+ next unless ( !$request->{itemtype}
+ || $item->{itype} eq $request->{itemtype} );
+
+ next unless $items_by_itemnumber{ $item->{itemnumber} }->{_object}->can_be_transferred( { to => $libraries->{ $request->{branchcode} } } );
+
$itemnumber = $item->{itemnumber};
$holdingbranch = $branch;
last PULL_BRANCHES2;
pickup_branch => $pickup_branch,
item_level => 0,
reservedate => $request->{reservedate},
+ timestamp => $request->{timestamp},
reservenotes => $request->{reservenotes},
};
$num_items_remaining--;
my $sth_load=$dbh->prepare("
INSERT INTO tmp_holdsqueue (biblionumber,itemnumber,barcode,surname,firstname,phone,borrowernumber,
- cardnumber,reservedate,title, itemcallnumber,
+ cardnumber,reservedate,timestamp,title, itemcallnumber,
holdingbranch,pickbranch,notes, item_level_request)
- VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+ VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
");
foreach my $itemnumber (sort keys %$item_map) {
my $pickbranch = $mapped_item->{pickup_branch};
my $holdingbranch = $mapped_item->{holdingbranch};
my $reservedate = $mapped_item->{reservedate};
+ my $timestamp = $mapped_item->{timestamp};
my $reservenotes = $mapped_item->{reservenotes};
my $item_level = $mapped_item->{item_level};
- my $item = GetItem($itemnumber);
- my $barcode = $item->{barcode};
- my $itemcallnumber = $item->{itemcallnumber};
+ my $item = Koha::Items->find($itemnumber);
+ my $barcode = $item->barcode;
+ my $itemcallnumber = $item->itemcallnumber;
- my $borrower = GetMember('borrowernumber'=>$borrowernumber);
- my $cardnumber = $borrower->{'cardnumber'};
- my $surname = $borrower->{'surname'};
- my $firstname = $borrower->{'firstname'};
- my $phone = $borrower->{'phone'};
+ my $patron = Koha::Patrons->find( $borrowernumber );
+ my $cardnumber = $patron->cardnumber;
+ my $surname = $patron->surname;
+ my $firstname = $patron->firstname;
+ my $phone = $patron->phone;
- my $bib = GetBiblioData($biblionumber);
- my $title = $bib->{title};
+ my $biblio = Koha::Biblios->find( $biblionumber );
+ my $title = $biblio->title;
$sth_load->execute($biblionumber, $itemnumber, $barcode, $surname, $firstname, $phone, $borrowernumber,
- $cardnumber, $reservedate, $title, $itemcallnumber,
+ $cardnumber, $reservedate, $timestamp, $title, $itemcallnumber,
$holdingbranch, $pickbranch, $reservenotes, $item_level);
}
}
projects / koha.git / blobdiff