Lines 149-157
BEGIN {
Link Here
|
149 |
|
149 |
|
150 |
GetMaxPatronHoldsForRecord |
150 |
GetMaxPatronHoldsForRecord |
151 |
|
151 |
|
152 |
&AddReserveGroup |
152 |
&AddHoldGroup |
153 |
&DeleteReserveGroup |
153 |
&DeleteHoldGroup |
154 |
&GetReserveGroupReserves |
154 |
&GetHoldGroupHolds |
155 |
); |
155 |
); |
156 |
@EXPORT_OK = qw( MergeHolds ); |
156 |
@EXPORT_OK = qw( MergeHolds ); |
157 |
} |
157 |
} |
Lines 177-183
sub AddReserve {
Link Here
|
177 |
$branch, $borrowernumber, $biblionumber, $bibitems, |
177 |
$branch, $borrowernumber, $biblionumber, $bibitems, |
178 |
$priority, $resdate, $expdate, $notes, |
178 |
$priority, $resdate, $expdate, $notes, |
179 |
$title, $checkitem, $found, $itemtype, |
179 |
$title, $checkitem, $found, $itemtype, |
180 |
$reserve_group_id |
180 |
$hold_group_id |
181 |
) = @_; |
181 |
) = @_; |
182 |
|
182 |
|
183 |
$resdate = output_pref( { str => dt_from_string( $resdate ), dateonly => 1, dateformat => 'iso' }) |
183 |
$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 |
|
221 |
|
Lines 639-645
sub GetReserveCount {
Link Here
|
639 |
SELECT COUNT(*) AS counter |
639 |
SELECT COUNT(*) AS counter |
640 |
FROM reserves |
640 |
FROM reserves |
641 |
WHERE borrowernumber = ? |
641 |
WHERE borrowernumber = ? |
642 |
AND reserve_group_id is NULL |
642 |
AND hold_group_id is NULL |
643 |
"; |
643 |
"; |
644 |
my $sth = $dbh->prepare($query); |
644 |
my $sth = $dbh->prepare($query); |
645 |
$sth->execute($borrowernumber); |
645 |
$sth->execute($borrowernumber); |
Lines 647-656
sub GetReserveCount {
Link Here
|
647 |
$count += $row->{counter}; |
647 |
$count += $row->{counter}; |
648 |
|
648 |
|
649 |
$query = " |
649 |
$query = " |
650 |
SELECT COUNT(DISTINCT reserve_group_id) AS counter |
650 |
SELECT COUNT(DISTINCT hold_group_id) AS counter |
651 |
FROM reserves |
651 |
FROM reserves |
652 |
WHERE borrowernumber = ? |
652 |
WHERE borrowernumber = ? |
653 |
AND reserve_group_id is not NULL |
653 |
AND hold_group_id is not NULL |
654 |
"; |
654 |
"; |
655 |
$sth = $dbh->prepare($query); |
655 |
$sth = $dbh->prepare($query); |
656 |
$sth->execute($borrowernumber); |
656 |
$sth->execute($borrowernumber); |
Lines 1369-1382
sub ModReserveAffect {
Link Here
|
1369 |
} |
1369 |
} |
1370 |
$hold->store(); |
1370 |
$hold->store(); |
1371 |
|
1371 |
|
1372 |
if ($hold->reserve_group_id) { |
1372 |
if ($hold->hold_group_id) { |
1373 |
# Delete other reserves from same group |
1373 |
# Delete other reserves from same group |
1374 |
$dbh->do(q{ |
1374 |
$dbh->do(q{ |
1375 |
DELETE FROM reserves |
1375 |
DELETE FROM reserves |
1376 |
WHERE reserve_group_id = ? |
1376 |
WHERE hold_group_id = ? |
1377 |
AND reserve_id != ? |
1377 |
AND reserve_id != ? |
1378 |
}, undef, $hold->reserve_group_id, $hold->reserve_id); |
1378 |
}, undef, $hold->hold_group_id, $hold->reserve_id); |
1379 |
DeleteReserveGroup($hold->reserve_group_id); |
1379 |
DeleteHoldGroup($hold->hold_group_id); |
1380 |
} |
1380 |
} |
1381 |
|
1381 |
|
1382 |
_koha_notify_reserve( $hold->reserve_id ) |
1382 |
_koha_notify_reserve( $hold->reserve_id ) |
Lines 1461-1467
sub GetReserveInfo {
Link Here
|
1461 |
reminderdate, |
1461 |
reminderdate, |
1462 |
priority, |
1462 |
priority, |
1463 |
found, |
1463 |
found, |
1464 |
reserve_group_id, |
1464 |
hold_group_id, |
1465 |
firstname, |
1465 |
firstname, |
1466 |
surname, |
1466 |
surname, |
1467 |
phone, |
1467 |
phone, |
Lines 2566-2619
sub GetHoldRule {
Link Here
|
2566 |
return $sth->fetchrow_hashref(); |
2566 |
return $sth->fetchrow_hashref(); |
2567 |
} |
2567 |
} |
2568 |
|
2568 |
|
2569 |
=head2 AddReserveGroup |
2569 |
=head2 AddHoldGroup |
2570 |
|
2570 |
|
2571 |
my $reserve_group_id = AddReserveGroup(); |
2571 |
my $hold_group_id = AddHoldGroup(); |
2572 |
|
2572 |
|
2573 |
Creates a new reserve group and returns its ID |
2573 |
Creates a new hold group and returns its ID |
2574 |
|
2574 |
|
2575 |
=cut |
2575 |
=cut |
2576 |
|
2576 |
|
2577 |
sub AddReserveGroup { |
2577 |
sub AddHoldGroup { |
2578 |
my $dbh = C4::Context->dbh; |
2578 |
my $dbh = C4::Context->dbh; |
2579 |
|
2579 |
|
2580 |
$dbh->do('INSERT INTO reserve_group VALUES ()'); |
2580 |
$dbh->do('INSERT INTO hold_group VALUES ()'); |
2581 |
return $dbh->last_insert_id(undef, undef, 'reserve_group', undef); |
2581 |
return $dbh->last_insert_id(undef, undef, 'hold_group', undef); |
2582 |
} |
2582 |
} |
2583 |
|
2583 |
|
2584 |
=head2 DeleteReserveGroup |
2584 |
=head2 DeleteHoldGroup |
2585 |
|
2585 |
|
2586 |
DeleteReserveGroup($reserve_group_id); |
2586 |
DeleteHoldGroup($hold_group_id); |
2587 |
|
2587 |
|
2588 |
Delete a reserve group. Reserves that belong to this group are not removed. |
2588 |
Delete a hold group. Holds that belong to this group are not removed. |
2589 |
|
2589 |
|
2590 |
=cut |
2590 |
=cut |
2591 |
|
2591 |
|
2592 |
sub DeleteReserveGroup { |
2592 |
sub DeleteHoldGroup { |
2593 |
my ($reserve_group_id) = @_; |
2593 |
my ($hold_group_id) = @_; |
2594 |
|
2594 |
|
2595 |
my $dbh = C4::Context->dbh; |
2595 |
my $dbh = C4::Context->dbh; |
2596 |
my $query = 'DELETE FROM reserve_group WHERE reserve_group_id = ?'; |
2596 |
my $query = 'DELETE FROM hold_group WHERE hold_group_id = ?'; |
2597 |
$dbh->do($query, undef, $reserve_group_id); |
2597 |
$dbh->do($query, undef, $hold_group_id); |
2598 |
} |
2598 |
} |
2599 |
|
2599 |
|
2600 |
=head2 GetReserveGroupReserves |
2600 |
=head2 GetHoldGroupHolds |
2601 |
|
2601 |
|
2602 |
my @reserves = GetReserveGroupReserves($reserve_group_id); |
2602 |
my @holds = GetHoldGroupHolds($hold_group_id); |
2603 |
|
2603 |
|
2604 |
Fetch all reserve from a reserve group. |
2604 |
Fetch all holds from a hold group. |
2605 |
|
2605 |
|
2606 |
=cut |
2606 |
=cut |
2607 |
|
2607 |
|
2608 |
sub GetReserveGroupReserves { |
2608 |
sub GetHoldGroupHolds { |
2609 |
my ($reserve_group_id) = @_; |
2609 |
my ($hold_group_id) = @_; |
2610 |
|
2610 |
|
2611 |
my $dbh = C4::Context->dbh; |
2611 |
my $dbh = C4::Context->dbh; |
2612 |
|
2612 |
|
2613 |
my $reserves = $dbh->selectall_arrayref(q{ |
2613 |
my $reserves = $dbh->selectall_arrayref(q{ |
2614 |
SELECT * FROM reserves |
2614 |
SELECT * FROM reserves |
2615 |
WHERE reserve_group_id = ? |
2615 |
WHERE hold_group_id = ? |
2616 |
}, { Slice => {} }, $reserve_group_id); |
2616 |
}, { Slice => {} }, $hold_group_id); |
2617 |
|
2617 |
|
2618 |
return () unless defined $reserves; |
2618 |
return () unless defined $reserves; |
2619 |
|
2619 |
|