Lines 138-146
BEGIN {
Link Here
|
138 |
|
138 |
|
139 |
GetMaxPatronHoldsForRecord |
139 |
GetMaxPatronHoldsForRecord |
140 |
|
140 |
|
141 |
&AddReserveGroup |
141 |
&AddHoldGroup |
142 |
&DeleteReserveGroup |
142 |
&DeleteHoldGroup |
143 |
&GetReserveGroupReserves |
143 |
&GetHoldGroupHolds |
144 |
); |
144 |
); |
145 |
@EXPORT_OK = qw( MergeHolds ); |
145 |
@EXPORT_OK = qw( MergeHolds ); |
146 |
} |
146 |
} |
Lines 167-173
sub AddReserve {
Link Here
|
167 |
$branch, $borrowernumber, $biblionumber, $bibitems, |
167 |
$branch, $borrowernumber, $biblionumber, $bibitems, |
168 |
$priority, $resdate, $expdate, $notes, |
168 |
$priority, $resdate, $expdate, $notes, |
169 |
$title, $checkitem, $found, $itemtype, |
169 |
$title, $checkitem, $found, $itemtype, |
170 |
$reserve_group_id |
170 |
$hold_group_id |
171 |
) = @_; |
171 |
) = @_; |
172 |
|
172 |
|
173 |
$resdate = output_pref( { str => dt_from_string( $resdate ), dateonly => 1, dateformat => 'iso' }) |
173 |
$resdate = output_pref( { str => dt_from_string( $resdate ), dateonly => 1, dateformat => 'iso' }) |
Lines 215-221
sub AddReserve {
Link Here
|
215 |
waitingdate => $waitingdate, |
215 |
waitingdate => $waitingdate, |
216 |
expirationdate => $expdate, |
216 |
expirationdate => $expdate, |
217 |
itemtype => $itemtype, |
217 |
itemtype => $itemtype, |
218 |
reserve_group_id => $reserve_group_id, |
218 |
hold_group_id => $hold_group_id, |
219 |
} |
219 |
} |
220 |
)->store(); |
220 |
)->store(); |
221 |
$hold->set_waiting() if $found eq 'W'; |
221 |
$hold->set_waiting() if $found eq 'W'; |
Lines 534-540
sub GetReserveCount {
Link Here
|
534 |
SELECT COUNT(*) AS counter |
534 |
SELECT COUNT(*) AS counter |
535 |
FROM reserves |
535 |
FROM reserves |
536 |
WHERE borrowernumber = ? |
536 |
WHERE borrowernumber = ? |
537 |
AND reserve_group_id is NULL"; #added by 15516 |
537 |
AND hold_group_id is NULL"; #added by 15516 |
538 |
my $sth = $dbh->prepare($query); |
538 |
my $sth = $dbh->prepare($query); |
539 |
$sth->execute($borrowernumber); |
539 |
$sth->execute($borrowernumber); |
540 |
my $row = $sth->fetchrow_hashref; |
540 |
my $row = $sth->fetchrow_hashref; |
Lines 543-552
sub GetReserveCount {
Link Here
|
543 |
$count += $row->{counter}; |
543 |
$count += $row->{counter}; |
544 |
|
544 |
|
545 |
$query = " |
545 |
$query = " |
546 |
SELECT COUNT(DISTINCT reserve_group_id) AS counter |
546 |
SELECT COUNT(DISTINCT hold_group_id) AS counter |
547 |
FROM reserves |
547 |
FROM reserves |
548 |
WHERE borrowernumber = ? |
548 |
WHERE borrowernumber = ? |
549 |
AND reserve_group_id is not NULL |
549 |
AND hold_group_id is not NULL |
550 |
"; |
550 |
"; |
551 |
$sth = $dbh->prepare($query); |
551 |
$sth = $dbh->prepare($query); |
552 |
$sth->execute($borrowernumber); |
552 |
$sth->execute($borrowernumber); |
Lines 1125-1138
sub ModReserveAffect {
Link Here
|
1125 |
$hold->itemnumber($itemnumber); |
1125 |
$hold->itemnumber($itemnumber); |
1126 |
$hold->set_waiting($transferToDo); |
1126 |
$hold->set_waiting($transferToDo); |
1127 |
|
1127 |
|
1128 |
if ($hold->reserve_group_id) { |
1128 |
if ($hold->hold_group_id) { |
1129 |
# Delete other reserves from same group |
1129 |
# Delete other reserves from same group |
1130 |
$dbh->do(q{ |
1130 |
$dbh->do(q{ |
1131 |
DELETE FROM reserves |
1131 |
DELETE FROM reserves |
1132 |
WHERE reserve_group_id = ? |
1132 |
WHERE hold_group_id = ? |
1133 |
AND reserve_id != ? |
1133 |
AND reserve_id != ? |
1134 |
}, undef, $hold->reserve_group_id, $hold->reserve_id); |
1134 |
}, undef, $hold->hold_group_id, $hold->reserve_id); |
1135 |
DeleteReserveGroup($hold->reserve_group_id); |
1135 |
DeleteHoldGroup($hold->hold_group_id); |
1136 |
} |
1136 |
} |
1137 |
|
1137 |
|
1138 |
_koha_notify_reserve( $hold->reserve_id ) |
1138 |
_koha_notify_reserve( $hold->reserve_id ) |
Lines 2222-2275
sub GetHoldRule {
Link Here
|
2222 |
return $sth->fetchrow_hashref(); |
2222 |
return $sth->fetchrow_hashref(); |
2223 |
} |
2223 |
} |
2224 |
|
2224 |
|
2225 |
=head2 AddReserveGroup |
2225 |
=head2 AddHoldGroup |
2226 |
|
2226 |
|
2227 |
my $reserve_group_id = AddReserveGroup(); |
2227 |
my $hold_group_id = AddHoldGroup(); |
2228 |
|
2228 |
|
2229 |
Creates a new reserve group and returns its ID |
2229 |
Creates a new hold group and returns its ID |
2230 |
|
2230 |
|
2231 |
=cut |
2231 |
=cut |
2232 |
|
2232 |
|
2233 |
sub AddReserveGroup { |
2233 |
sub AddHoldGroup { |
2234 |
my $dbh = C4::Context->dbh; |
2234 |
my $dbh = C4::Context->dbh; |
2235 |
|
2235 |
|
2236 |
$dbh->do('INSERT INTO reserve_group VALUES ()'); |
2236 |
$dbh->do('INSERT INTO hold_group VALUES ()'); |
2237 |
return $dbh->last_insert_id(undef, undef, 'reserve_group', undef); |
2237 |
return $dbh->last_insert_id(undef, undef, 'hold_group', undef); |
2238 |
} |
2238 |
} |
2239 |
|
2239 |
|
2240 |
=head2 DeleteReserveGroup |
2240 |
=head2 DeleteHoldGroup |
2241 |
|
2241 |
|
2242 |
DeleteReserveGroup($reserve_group_id); |
2242 |
DeleteHoldGroup($hold_group_id); |
2243 |
|
2243 |
|
2244 |
Delete a reserve group. Reserves that belong to this group are not removed. |
2244 |
Delete a hold group. Reserves that belong to this group are not removed. |
2245 |
|
2245 |
|
2246 |
=cut |
2246 |
=cut |
2247 |
|
2247 |
|
2248 |
sub DeleteReserveGroup { |
2248 |
sub DeleteHoldGroup { |
2249 |
my ($reserve_group_id) = @_; |
2249 |
my ($hold_group_id) = @_; |
2250 |
|
2250 |
|
2251 |
my $dbh = C4::Context->dbh; |
2251 |
my $dbh = C4::Context->dbh; |
2252 |
my $query = 'DELETE FROM reserve_group WHERE reserve_group_id = ?'; |
2252 |
my $query = 'DELETE FROM hold_group WHERE hold_group_id = ?'; |
2253 |
$dbh->do($query, undef, $reserve_group_id); |
2253 |
$dbh->do($query, undef, $hold_group_id); |
2254 |
} |
2254 |
} |
2255 |
|
2255 |
|
2256 |
=head2 GetReserveGroupReserves |
2256 |
=head2 GetHoldGroupHolds |
2257 |
|
2257 |
|
2258 |
my @reserves = GetReserveGroupReserves($reserve_group_id); |
2258 |
my @reserves = GetHoldGroupHolds($hold_group_id); |
2259 |
|
2259 |
|
2260 |
Fetch all reserve from a reserve group. |
2260 |
Fetch all reserve from a hold group. |
2261 |
|
2261 |
|
2262 |
=cut |
2262 |
=cut |
2263 |
|
2263 |
|
2264 |
sub GetReserveGroupReserves { |
2264 |
sub GetHoldGroupHolds { |
2265 |
my ($reserve_group_id) = @_; |
2265 |
my ($hold_group_id) = @_; |
2266 |
|
2266 |
|
2267 |
my $dbh = C4::Context->dbh; |
2267 |
my $dbh = C4::Context->dbh; |
2268 |
|
2268 |
|
2269 |
my $reserves = $dbh->selectall_arrayref(q{ |
2269 |
my $reserves = $dbh->selectall_arrayref(q{ |
2270 |
SELECT * FROM reserves |
2270 |
SELECT * FROM reserves |
2271 |
WHERE reserve_group_id = ? |
2271 |
WHERE hold_group_id = ? |
2272 |
}, { Slice => {} }, $reserve_group_id); |
2272 |
}, { Slice => {} }, $hold_group_id); |
2273 |
|
2273 |
|
2274 |
return () unless defined $reserves; |
2274 |
return () unless defined $reserves; |
2275 |
|
2275 |
|