Lines 99-105
my $borrower = GetMember( borrowernumber => $borrowernumber );
Link Here
|
99 |
my $biblionumber = $bibnum; |
99 |
my $biblionumber = $bibnum; |
100 |
my $barcode = $testbarcode; |
100 |
my $barcode = $testbarcode; |
101 |
|
101 |
|
102 |
my $constraint = 'a'; |
|
|
103 |
my $bibitems = ''; |
102 |
my $bibitems = ''; |
104 |
my $priority = '1'; |
103 |
my $priority = '1'; |
105 |
my $resdate = undef; |
104 |
my $resdate = undef; |
Lines 112-118
my @branches = GetBranchesLoop();
Link Here
|
112 |
my $branch = $branches[0][0]{value}; |
111 |
my $branch = $branches[0][0]{value}; |
113 |
|
112 |
|
114 |
AddReserve($branch, $borrowernumber, $biblionumber, |
113 |
AddReserve($branch, $borrowernumber, $biblionumber, |
115 |
$constraint, $bibitems, $priority, $resdate, $expdate, $notes, |
114 |
$bibitems, $priority, $resdate, $expdate, $notes, |
116 |
$title, $checkitem, $found); |
115 |
$title, $checkitem, $found); |
117 |
|
116 |
|
118 |
my ($status, $reserve, $all_reserves) = CheckReserves($itemnumber, $barcode); |
117 |
my ($status, $reserve, $all_reserves) = CheckReserves($itemnumber, $barcode); |
Lines 223-235
my ($itemnum_cpl, $itemnum_fpl);
Link Here
|
223 |
# (bug 11947) |
222 |
# (bug 11947) |
224 |
$dbh->do("DELETE FROM reserves WHERE biblionumber=?",undef,($bibnum2)); |
223 |
$dbh->do("DELETE FROM reserves WHERE biblionumber=?",undef,($bibnum2)); |
225 |
AddReserve('RPL', $requesters{'RPL'}, $bibnum2, |
224 |
AddReserve('RPL', $requesters{'RPL'}, $bibnum2, |
226 |
$constraint, $bibitems, 1, $resdate, $expdate, $notes, |
225 |
$bibitems, 1, $resdate, $expdate, $notes, |
227 |
$title, $checkitem, $found); |
226 |
$title, $checkitem, $found); |
228 |
AddReserve('FPL', $requesters{'FPL'}, $bibnum2, |
227 |
AddReserve('FPL', $requesters{'FPL'}, $bibnum2, |
229 |
$constraint, $bibitems, 2, $resdate, $expdate, $notes, |
228 |
$bibitems, 2, $resdate, $expdate, $notes, |
230 |
$title, $checkitem, $found); |
229 |
$title, $checkitem, $found); |
231 |
AddReserve('CPL', $requesters{'CPL'}, $bibnum2, |
230 |
AddReserve('CPL', $requesters{'CPL'}, $bibnum2, |
232 |
$constraint, $bibitems, 3, $resdate, $expdate, $notes, |
231 |
$bibitems, 3, $resdate, $expdate, $notes, |
233 |
$title, $checkitem, $found); |
232 |
$title, $checkitem, $found); |
234 |
ModReserveAffect($itemnum_cpl, $requesters{'RPL'}, 0); |
233 |
ModReserveAffect($itemnum_cpl, $requesters{'RPL'}, 0); |
235 |
|
234 |
|
Lines 244-256
is($reserves[2]{priority}, 2, 'Item is correctly priority 2');
Link Here
|
244 |
|
243 |
|
245 |
$dbh->do("DELETE FROM reserves WHERE biblionumber=?",undef,($bibnum2)); |
244 |
$dbh->do("DELETE FROM reserves WHERE biblionumber=?",undef,($bibnum2)); |
246 |
AddReserve('RPL', $requesters{'RPL'}, $bibnum2, |
245 |
AddReserve('RPL', $requesters{'RPL'}, $bibnum2, |
247 |
$constraint, $bibitems, 1, $resdate, $expdate, $notes, |
246 |
$bibitems, 1, $resdate, $expdate, $notes, |
248 |
$title, $checkitem, $found); |
247 |
$title, $checkitem, $found); |
249 |
AddReserve('FPL', $requesters{'FPL'}, $bibnum2, |
248 |
AddReserve('FPL', $requesters{'FPL'}, $bibnum2, |
250 |
$constraint, $bibitems, 2, $resdate, $expdate, $notes, |
249 |
$bibitems, 2, $resdate, $expdate, $notes, |
251 |
$title, $checkitem, $found); |
250 |
$title, $checkitem, $found); |
252 |
AddReserve('CPL', $requesters{'CPL'}, $bibnum2, |
251 |
AddReserve('CPL', $requesters{'CPL'}, $bibnum2, |
253 |
$constraint, $bibitems, 3, $resdate, $expdate, $notes, |
252 |
$bibitems, 3, $resdate, $expdate, $notes, |
254 |
$title, $checkitem, $found); |
253 |
$title, $checkitem, $found); |
255 |
|
254 |
|
256 |
# Ensure that the item's home library controls hold policy lookup |
255 |
# Ensure that the item's home library controls hold policy lookup |
Lines 300-306
$resdate= undef; #defaults to today in AddReserve
Link Here
|
300 |
$expdate= undef; #no expdate |
299 |
$expdate= undef; #no expdate |
301 |
$dbh->do("DELETE FROM reserves WHERE biblionumber=?",undef,($bibnum)); |
300 |
$dbh->do("DELETE FROM reserves WHERE biblionumber=?",undef,($bibnum)); |
302 |
AddReserve('CPL', $requesters{'CPL'}, $bibnum, |
301 |
AddReserve('CPL', $requesters{'CPL'}, $bibnum, |
303 |
$constraint, $bibitems, 1, $resdate, $expdate, $notes, |
302 |
$bibitems, 1, $resdate, $expdate, $notes, |
304 |
$title, $checkitem, $found); |
303 |
$title, $checkitem, $found); |
305 |
($status)=CheckReserves($itemnumber,undef,undef); |
304 |
($status)=CheckReserves($itemnumber,undef,undef); |
306 |
is( $status, 'Reserved', 'CheckReserves returns reserve without lookahead'); |
305 |
is( $status, 'Reserved', 'CheckReserves returns reserve without lookahead'); |
Lines 315-321
$resdate->add_duration(DateTime::Duration->new(days => 4));
Link Here
|
315 |
$resdate=output_pref($resdate); |
314 |
$resdate=output_pref($resdate); |
316 |
$expdate= undef; #no expdate |
315 |
$expdate= undef; #no expdate |
317 |
AddReserve('CPL', $requesters{'CPL'}, $bibnum, |
316 |
AddReserve('CPL', $requesters{'CPL'}, $bibnum, |
318 |
$constraint, $bibitems, 1, $resdate, $expdate, $notes, |
317 |
$bibitems, 1, $resdate, $expdate, $notes, |
319 |
$title, $checkitem, $found); |
318 |
$title, $checkitem, $found); |
320 |
($status)=CheckReserves($itemnumber,undef,undef); |
319 |
($status)=CheckReserves($itemnumber,undef,undef); |
321 |
is( $status, '', 'CheckReserves returns no future reserve without lookahead'); |
320 |
is( $status, '', 'CheckReserves returns no future reserve without lookahead'); |
Lines 372-385
$resdate= dt_from_string();
Link Here
|
372 |
$resdate->add_duration(DateTime::Duration->new(days => 2)); |
371 |
$resdate->add_duration(DateTime::Duration->new(days => 2)); |
373 |
$resdate=output_pref($resdate); |
372 |
$resdate=output_pref($resdate); |
374 |
AddReserve('CPL', $requesters{'CPL'}, $bibnum, |
373 |
AddReserve('CPL', $requesters{'CPL'}, $bibnum, |
375 |
$constraint, $bibitems, 1, $resdate, $expdate, $notes, |
374 |
$bibitems, 1, $resdate, $expdate, $notes, |
376 |
$title, $checkitem, $found); |
375 |
$title, $checkitem, $found); |
377 |
my @results= GetReservesFromItemnumber($itemnumber); |
376 |
my @results= GetReservesFromItemnumber($itemnumber); |
378 |
is(defined $results[3]?1:0, 0, 'GetReservesFromItemnumber does not return a future next available hold'); |
377 |
is(defined $results[3]?1:0, 0, 'GetReservesFromItemnumber does not return a future next available hold'); |
379 |
# 9788b: GetReservesFromItemnumber does not return future item level hold |
378 |
# 9788b: GetReservesFromItemnumber does not return future item level hold |
380 |
$dbh->do("DELETE FROM reserves WHERE biblionumber=?",undef,($bibnum)); |
379 |
$dbh->do("DELETE FROM reserves WHERE biblionumber=?",undef,($bibnum)); |
381 |
AddReserve('CPL', $requesters{'CPL'}, $bibnum, |
380 |
AddReserve('CPL', $requesters{'CPL'}, $bibnum, |
382 |
$constraint, $bibitems, 1, $resdate, $expdate, $notes, |
381 |
$bibitems, 1, $resdate, $expdate, $notes, |
383 |
$title, $itemnumber, $found); #item level hold |
382 |
$title, $itemnumber, $found); #item level hold |
384 |
@results= GetReservesFromItemnumber($itemnumber); |
383 |
@results= GetReservesFromItemnumber($itemnumber); |
385 |
is(defined $results[3]?1:0, 0, 'GetReservesFromItemnumber does not return a future item level hold'); |
384 |
is(defined $results[3]?1:0, 0, 'GetReservesFromItemnumber does not return a future item level hold'); |
Lines 394-400
my $p = C4::Reserves::CalculatePriority($bibnum2);
Link Here
|
394 |
is($p, 4, 'CalculatePriority should now return priority 4'); |
393 |
is($p, 4, 'CalculatePriority should now return priority 4'); |
395 |
$resdate=undef; |
394 |
$resdate=undef; |
396 |
AddReserve('CPL', $requesters{'CPL'}, $bibnum2, |
395 |
AddReserve('CPL', $requesters{'CPL'}, $bibnum2, |
397 |
$constraint, $bibitems, $p, $resdate, $expdate, $notes, |
396 |
$bibitems, $p, $resdate, $expdate, $notes, |
398 |
$title, $checkitem, $found); |
397 |
$title, $checkitem, $found); |
399 |
$p = C4::Reserves::CalculatePriority($bibnum2); |
398 |
$p = C4::Reserves::CalculatePriority($bibnum2); |
400 |
is($p, 5, 'CalculatePriority should now return priority 5'); |
399 |
is($p, 5, 'CalculatePriority should now return priority 5'); |
Lines 404-410
$p = C4::Reserves::CalculatePriority($bibnum);
Link Here
|
404 |
is($p, 1, 'CalculatePriority should now return priority 1'); |
403 |
is($p, 1, 'CalculatePriority should now return priority 1'); |
405 |
#add a new reserve and confirm it to waiting |
404 |
#add a new reserve and confirm it to waiting |
406 |
AddReserve('CPL', $requesters{'CPL'}, $bibnum, |
405 |
AddReserve('CPL', $requesters{'CPL'}, $bibnum, |
407 |
$constraint, $bibitems, $p, $resdate, $expdate, $notes, |
406 |
$bibitems, $p, $resdate, $expdate, $notes, |
408 |
$title, $itemnumber, $found); |
407 |
$title, $itemnumber, $found); |
409 |
$p = C4::Reserves::CalculatePriority($bibnum); |
408 |
$p = C4::Reserves::CalculatePriority($bibnum); |
410 |
is($p, 2, 'CalculatePriority should now return priority 2'); |
409 |
is($p, 2, 'CalculatePriority should now return priority 2'); |
Lines 413-419
$p = C4::Reserves::CalculatePriority($bibnum);
Link Here
|
413 |
is($p, 1, 'CalculatePriority should now return priority 1'); |
412 |
is($p, 1, 'CalculatePriority should now return priority 1'); |
414 |
#add another biblio hold, no resdate |
413 |
#add another biblio hold, no resdate |
415 |
AddReserve('CPL', $requesters{'CPL'}, $bibnum, |
414 |
AddReserve('CPL', $requesters{'CPL'}, $bibnum, |
416 |
$constraint, $bibitems, $p, $resdate, $expdate, $notes, |
415 |
$bibitems, $p, $resdate, $expdate, $notes, |
417 |
$title, $checkitem, $found); |
416 |
$title, $checkitem, $found); |
418 |
$p = C4::Reserves::CalculatePriority($bibnum); |
417 |
$p = C4::Reserves::CalculatePriority($bibnum); |
419 |
is($p, 2, 'CalculatePriority should now return priority 2'); |
418 |
is($p, 2, 'CalculatePriority should now return priority 2'); |
Lines 422-428
C4::Context->set_preference('AllowHoldDateInFuture', 1);
Link Here
|
422 |
$resdate= dt_from_string(); |
421 |
$resdate= dt_from_string(); |
423 |
$resdate->add_duration(DateTime::Duration->new(days => 1)); |
422 |
$resdate->add_duration(DateTime::Duration->new(days => 1)); |
424 |
AddReserve('CPL', $requesters{'CPL'}, $bibnum, |
423 |
AddReserve('CPL', $requesters{'CPL'}, $bibnum, |
425 |
$constraint, $bibitems, $p, output_pref($resdate), $expdate, $notes, |
424 |
$bibitems, $p, output_pref($resdate), $expdate, $notes, |
426 |
$title, $checkitem, $found); |
425 |
$title, $checkitem, $found); |
427 |
$p = C4::Reserves::CalculatePriority($bibnum); |
426 |
$p = C4::Reserves::CalculatePriority($bibnum); |
428 |
is($p, 2, 'CalculatePriority should now still return priority 2'); |
427 |
is($p, 2, 'CalculatePriority should now still return priority 2'); |
Lines 434-440
is($p, 3, 'CalculatePriority should now return priority 3');
Link Here
|
434 |
# Tests for cancel reserves by users from OPAC. |
433 |
# Tests for cancel reserves by users from OPAC. |
435 |
$dbh->do('DELETE FROM reserves', undef, ($bibnum)); |
434 |
$dbh->do('DELETE FROM reserves', undef, ($bibnum)); |
436 |
AddReserve('CPL', $requesters{'CPL'}, $item_bibnum, |
435 |
AddReserve('CPL', $requesters{'CPL'}, $item_bibnum, |
437 |
$constraint, $bibitems, 1, undef, $expdate, $notes, |
436 |
$bibitems, 1, undef, $expdate, $notes, |
438 |
$title, $checkitem, ''); |
437 |
$title, $checkitem, ''); |
439 |
my (undef, $canres, undef) = CheckReserves($itemnumber); |
438 |
my (undef, $canres, undef) = CheckReserves($itemnumber); |
440 |
|
439 |
|
Lines 464-470
is($cancancel, 0, 'Reserve in transfer status cant be canceled');
Link Here
|
464 |
|
463 |
|
465 |
$dbh->do('DELETE FROM reserves', undef, ($bibnum)); |
464 |
$dbh->do('DELETE FROM reserves', undef, ($bibnum)); |
466 |
AddReserve('CPL', $requesters{'CPL'}, $item_bibnum, |
465 |
AddReserve('CPL', $requesters{'CPL'}, $item_bibnum, |
467 |
$constraint, $bibitems, 1, undef, $expdate, $notes, |
466 |
$bibitems, 1, undef, $expdate, $notes, |
468 |
$title, $checkitem, ''); |
467 |
$title, $checkitem, ''); |
469 |
(undef, $canres, undef) = CheckReserves($itemnumber); |
468 |
(undef, $canres, undef) = CheckReserves($itemnumber); |
470 |
|
469 |
|
471 |
- |
|
|