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