Lines 140-148
BEGIN {
Link Here
|
140 |
|
140 |
|
141 |
GetMaxPatronHoldsForRecord |
141 |
GetMaxPatronHoldsForRecord |
142 |
|
142 |
|
143 |
&AddReserveGroup |
143 |
&AddHoldGroup |
144 |
&DeleteReserveGroup |
144 |
&DeleteHoldGroup |
145 |
&GetReserveGroupReserves |
145 |
&GetHoldGroupHolds |
146 |
); |
146 |
); |
147 |
@EXPORT_OK = qw( MergeHolds ); |
147 |
@EXPORT_OK = qw( MergeHolds ); |
148 |
} |
148 |
} |
Lines 169-175
sub AddReserve {
Link Here
|
169 |
$branch, $borrowernumber, $biblionumber, $bibitems, |
169 |
$branch, $borrowernumber, $biblionumber, $bibitems, |
170 |
$priority, $resdate, $expdate, $notes, |
170 |
$priority, $resdate, $expdate, $notes, |
171 |
$title, $checkitem, $found, $itemtype, |
171 |
$title, $checkitem, $found, $itemtype, |
172 |
$reserve_group_id |
172 |
$hold_group_id |
173 |
) = @_; |
173 |
) = @_; |
174 |
|
174 |
|
175 |
$resdate = output_pref( { str => dt_from_string( $resdate ), dateonly => 1, dateformat => 'iso' }) |
175 |
$resdate = output_pref( { str => dt_from_string( $resdate ), dateonly => 1, dateformat => 'iso' }) |
Lines 217-223
sub AddReserve {
Link Here
|
217 |
waitingdate => $waitingdate, |
217 |
waitingdate => $waitingdate, |
218 |
expirationdate => $expdate, |
218 |
expirationdate => $expdate, |
219 |
itemtype => $itemtype, |
219 |
itemtype => $itemtype, |
220 |
reserve_group_id => $reserve_group_id, |
220 |
hold_group_id => $hold_group_id, |
221 |
} |
221 |
} |
222 |
)->store(); |
222 |
)->store(); |
223 |
$hold->set_waiting() if $found eq 'W'; |
223 |
$hold->set_waiting() if $found eq 'W'; |
Lines 533-539
sub GetReserveCount {
Link Here
|
533 |
SELECT COUNT(*) AS counter |
533 |
SELECT COUNT(*) AS counter |
534 |
FROM reserves |
534 |
FROM reserves |
535 |
WHERE borrowernumber = ? |
535 |
WHERE borrowernumber = ? |
536 |
AND reserve_group_id is NULL"; #added by 15516 |
536 |
AND hold_group_id is NULL"; #added by 15516 |
537 |
my $sth = $dbh->prepare($query); |
537 |
my $sth = $dbh->prepare($query); |
538 |
$sth->execute($borrowernumber); |
538 |
$sth->execute($borrowernumber); |
539 |
my $row = $sth->fetchrow_hashref; |
539 |
my $row = $sth->fetchrow_hashref; |
Lines 542-551
sub GetReserveCount {
Link Here
|
542 |
$count += $row->{counter}; |
542 |
$count += $row->{counter}; |
543 |
|
543 |
|
544 |
$query = " |
544 |
$query = " |
545 |
SELECT COUNT(DISTINCT reserve_group_id) AS counter |
545 |
SELECT COUNT(DISTINCT hold_group_id) AS counter |
546 |
FROM reserves |
546 |
FROM reserves |
547 |
WHERE borrowernumber = ? |
547 |
WHERE borrowernumber = ? |
548 |
AND reserve_group_id is not NULL |
548 |
AND hold_group_id is not NULL |
549 |
"; |
549 |
"; |
550 |
$sth = $dbh->prepare($query); |
550 |
$sth = $dbh->prepare($query); |
551 |
$sth->execute($borrowernumber); |
551 |
$sth->execute($borrowernumber); |
Lines 1113-1126
sub ModReserveAffect {
Link Here
|
1113 |
$hold->itemnumber($itemnumber); |
1113 |
$hold->itemnumber($itemnumber); |
1114 |
$hold->set_waiting($transferToDo); |
1114 |
$hold->set_waiting($transferToDo); |
1115 |
|
1115 |
|
1116 |
if ($hold->reserve_group_id) { |
1116 |
if ($hold->hold_group_id) { |
1117 |
# Delete other reserves from same group |
1117 |
# Delete other reserves from same group |
1118 |
$dbh->do(q{ |
1118 |
$dbh->do(q{ |
1119 |
DELETE FROM reserves |
1119 |
DELETE FROM reserves |
1120 |
WHERE reserve_group_id = ? |
1120 |
WHERE hold_group_id = ? |
1121 |
AND reserve_id != ? |
1121 |
AND reserve_id != ? |
1122 |
}, undef, $hold->reserve_group_id, $hold->reserve_id); |
1122 |
}, undef, $hold->hold_group_id, $hold->reserve_id); |
1123 |
DeleteReserveGroup($hold->reserve_group_id); |
1123 |
DeleteHoldGroup($hold->hold_group_id); |
1124 |
} |
1124 |
} |
1125 |
|
1125 |
|
1126 |
_koha_notify_reserve( $hold->reserve_id ) |
1126 |
_koha_notify_reserve( $hold->reserve_id ) |
Lines 2209-2262
sub GetHoldRule {
Link Here
|
2209 |
return $sth->fetchrow_hashref(); |
2209 |
return $sth->fetchrow_hashref(); |
2210 |
} |
2210 |
} |
2211 |
|
2211 |
|
2212 |
=head2 AddReserveGroup |
2212 |
=head2 AddHoldGroup |
2213 |
|
2213 |
|
2214 |
my $reserve_group_id = AddReserveGroup(); |
2214 |
my $hold_group_id = AddHoldGroup(); |
2215 |
|
2215 |
|
2216 |
Creates a new reserve group and returns its ID |
2216 |
Creates a new hold group and returns its ID |
2217 |
|
2217 |
|
2218 |
=cut |
2218 |
=cut |
2219 |
|
2219 |
|
2220 |
sub AddReserveGroup { |
2220 |
sub AddHoldGroup { |
2221 |
my $dbh = C4::Context->dbh; |
2221 |
my $dbh = C4::Context->dbh; |
2222 |
|
2222 |
|
2223 |
$dbh->do('INSERT INTO reserve_group VALUES ()'); |
2223 |
$dbh->do('INSERT INTO hold_group VALUES ()'); |
2224 |
return $dbh->last_insert_id(undef, undef, 'reserve_group', undef); |
2224 |
return $dbh->last_insert_id(undef, undef, 'hold_group', undef); |
2225 |
} |
2225 |
} |
2226 |
|
2226 |
|
2227 |
=head2 DeleteReserveGroup |
2227 |
=head2 DeleteHoldGroup |
2228 |
|
2228 |
|
2229 |
DeleteReserveGroup($reserve_group_id); |
2229 |
DeleteHoldGroup($hold_group_id); |
2230 |
|
2230 |
|
2231 |
Delete a reserve group. Reserves that belong to this group are not removed. |
2231 |
Delete a hold group. Reserves that belong to this group are not removed. |
2232 |
|
2232 |
|
2233 |
=cut |
2233 |
=cut |
2234 |
|
2234 |
|
2235 |
sub DeleteReserveGroup { |
2235 |
sub DeleteHoldGroup { |
2236 |
my ($reserve_group_id) = @_; |
2236 |
my ($hold_group_id) = @_; |
2237 |
|
2237 |
|
2238 |
my $dbh = C4::Context->dbh; |
2238 |
my $dbh = C4::Context->dbh; |
2239 |
my $query = 'DELETE FROM reserve_group WHERE reserve_group_id = ?'; |
2239 |
my $query = 'DELETE FROM hold_group WHERE hold_group_id = ?'; |
2240 |
$dbh->do($query, undef, $reserve_group_id); |
2240 |
$dbh->do($query, undef, $hold_group_id); |
2241 |
} |
2241 |
} |
2242 |
|
2242 |
|
2243 |
=head2 GetReserveGroupReserves |
2243 |
=head2 GetHoldGroupHolds |
2244 |
|
2244 |
|
2245 |
my @reserves = GetReserveGroupReserves($reserve_group_id); |
2245 |
my @reserves = GetHoldGroupHolds($hold_group_id); |
2246 |
|
2246 |
|
2247 |
Fetch all reserve from a reserve group. |
2247 |
Fetch all reserve from a hold group. |
2248 |
|
2248 |
|
2249 |
=cut |
2249 |
=cut |
2250 |
|
2250 |
|
2251 |
sub GetReserveGroupReserves { |
2251 |
sub GetHoldGroupHolds { |
2252 |
my ($reserve_group_id) = @_; |
2252 |
my ($hold_group_id) = @_; |
2253 |
|
2253 |
|
2254 |
my $dbh = C4::Context->dbh; |
2254 |
my $dbh = C4::Context->dbh; |
2255 |
|
2255 |
|
2256 |
my $reserves = $dbh->selectall_arrayref(q{ |
2256 |
my $reserves = $dbh->selectall_arrayref(q{ |
2257 |
SELECT * FROM reserves |
2257 |
SELECT * FROM reserves |
2258 |
WHERE reserve_group_id = ? |
2258 |
WHERE hold_group_id = ? |
2259 |
}, { Slice => {} }, $reserve_group_id); |
2259 |
}, { Slice => {} }, $hold_group_id); |
2260 |
|
2260 |
|
2261 |
return () unless defined $reserves; |
2261 |
return () unless defined $reserves; |
2262 |
|
2262 |
|