|
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 1124-1137
sub ModReserveAffect {
Link Here
|
| 1124 |
$hold->itemnumber($itemnumber); |
1124 |
$hold->itemnumber($itemnumber); |
| 1125 |
$hold->set_waiting($transferToDo); |
1125 |
$hold->set_waiting($transferToDo); |
| 1126 |
|
1126 |
|
| 1127 |
if ($hold->reserve_group_id) { |
1127 |
if ($hold->hold_group_id) { |
| 1128 |
# Delete other reserves from same group |
1128 |
# Delete other reserves from same group |
| 1129 |
$dbh->do(q{ |
1129 |
$dbh->do(q{ |
| 1130 |
DELETE FROM reserves |
1130 |
DELETE FROM reserves |
| 1131 |
WHERE reserve_group_id = ? |
1131 |
WHERE hold_group_id = ? |
| 1132 |
AND reserve_id != ? |
1132 |
AND reserve_id != ? |
| 1133 |
}, undef, $hold->reserve_group_id, $hold->reserve_id); |
1133 |
}, undef, $hold->hold_group_id, $hold->reserve_id); |
| 1134 |
DeleteReserveGroup($hold->reserve_group_id); |
1134 |
DeleteHoldGroup($hold->hold_group_id); |
| 1135 |
} |
1135 |
} |
| 1136 |
|
1136 |
|
| 1137 |
_koha_notify_reserve( $hold->reserve_id ) |
1137 |
_koha_notify_reserve( $hold->reserve_id ) |
|
Lines 2228-2281
sub GetHoldRule {
Link Here
|
| 2228 |
return $sth->fetchrow_hashref(); |
2228 |
return $sth->fetchrow_hashref(); |
| 2229 |
} |
2229 |
} |
| 2230 |
|
2230 |
|
| 2231 |
=head2 AddReserveGroup |
2231 |
=head2 AddHoldGroup |
| 2232 |
|
2232 |
|
| 2233 |
my $reserve_group_id = AddReserveGroup(); |
2233 |
my $hold_group_id = AddHoldGroup(); |
| 2234 |
|
2234 |
|
| 2235 |
Creates a new reserve group and returns its ID |
2235 |
Creates a new hold group and returns its ID |
| 2236 |
|
2236 |
|
| 2237 |
=cut |
2237 |
=cut |
| 2238 |
|
2238 |
|
| 2239 |
sub AddReserveGroup { |
2239 |
sub AddHoldGroup { |
| 2240 |
my $dbh = C4::Context->dbh; |
2240 |
my $dbh = C4::Context->dbh; |
| 2241 |
|
2241 |
|
| 2242 |
$dbh->do('INSERT INTO reserve_group VALUES ()'); |
2242 |
$dbh->do('INSERT INTO hold_group VALUES ()'); |
| 2243 |
return $dbh->last_insert_id(undef, undef, 'reserve_group', undef); |
2243 |
return $dbh->last_insert_id(undef, undef, 'hold_group', undef); |
| 2244 |
} |
2244 |
} |
| 2245 |
|
2245 |
|
| 2246 |
=head2 DeleteReserveGroup |
2246 |
=head2 DeleteHoldGroup |
| 2247 |
|
2247 |
|
| 2248 |
DeleteReserveGroup($reserve_group_id); |
2248 |
DeleteHoldGroup($hold_group_id); |
| 2249 |
|
2249 |
|
| 2250 |
Delete a reserve group. Reserves that belong to this group are not removed. |
2250 |
Delete a hold group. Reserves that belong to this group are not removed. |
| 2251 |
|
2251 |
|
| 2252 |
=cut |
2252 |
=cut |
| 2253 |
|
2253 |
|
| 2254 |
sub DeleteReserveGroup { |
2254 |
sub DeleteHoldGroup { |
| 2255 |
my ($reserve_group_id) = @_; |
2255 |
my ($hold_group_id) = @_; |
| 2256 |
|
2256 |
|
| 2257 |
my $dbh = C4::Context->dbh; |
2257 |
my $dbh = C4::Context->dbh; |
| 2258 |
my $query = 'DELETE FROM reserve_group WHERE reserve_group_id = ?'; |
2258 |
my $query = 'DELETE FROM hold_group WHERE hold_group_id = ?'; |
| 2259 |
$dbh->do($query, undef, $reserve_group_id); |
2259 |
$dbh->do($query, undef, $hold_group_id); |
| 2260 |
} |
2260 |
} |
| 2261 |
|
2261 |
|
| 2262 |
=head2 GetReserveGroupReserves |
2262 |
=head2 GetHoldGroupHolds |
| 2263 |
|
2263 |
|
| 2264 |
my @reserves = GetReserveGroupReserves($reserve_group_id); |
2264 |
my @reserves = GetHoldGroupHolds($hold_group_id); |
| 2265 |
|
2265 |
|
| 2266 |
Fetch all reserve from a reserve group. |
2266 |
Fetch all reserve from a hold group. |
| 2267 |
|
2267 |
|
| 2268 |
=cut |
2268 |
=cut |
| 2269 |
|
2269 |
|
| 2270 |
sub GetReserveGroupReserves { |
2270 |
sub GetHoldGroupHolds { |
| 2271 |
my ($reserve_group_id) = @_; |
2271 |
my ($hold_group_id) = @_; |
| 2272 |
|
2272 |
|
| 2273 |
my $dbh = C4::Context->dbh; |
2273 |
my $dbh = C4::Context->dbh; |
| 2274 |
|
2274 |
|
| 2275 |
my $reserves = $dbh->selectall_arrayref(q{ |
2275 |
my $reserves = $dbh->selectall_arrayref(q{ |
| 2276 |
SELECT * FROM reserves |
2276 |
SELECT * FROM reserves |
| 2277 |
WHERE reserve_group_id = ? |
2277 |
WHERE hold_group_id = ? |
| 2278 |
}, { Slice => {} }, $reserve_group_id); |
2278 |
}, { Slice => {} }, $hold_group_id); |
| 2279 |
|
2279 |
|
| 2280 |
return () unless defined $reserves; |
2280 |
return () unless defined $reserves; |
| 2281 |
|
2281 |
|