Lines 100-106
my $borrower = GetMember( borrowernumber => $borrowernumber );
Link Here
|
100 |
my $biblionumber = $bibnum; |
100 |
my $biblionumber = $bibnum; |
101 |
my $barcode = $testbarcode; |
101 |
my $barcode = $testbarcode; |
102 |
|
102 |
|
103 |
my $bibitems = ''; |
|
|
104 |
my $priority = '1'; |
103 |
my $priority = '1'; |
105 |
my $resdate = undef; |
104 |
my $resdate = undef; |
106 |
my $expdate = undef; |
105 |
my $expdate = undef; |
Lines 112-119
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 |
$bibitems, $priority, $resdate, $expdate, $notes, |
114 |
$priority, $resdate, $expdate, $notes, $title, |
116 |
$title, $checkitem, $found); |
115 |
$checkitem, $found); |
117 |
|
116 |
|
118 |
my ($status, $reserve, $all_reserves) = CheckReserves($itemnumber, $barcode); |
117 |
my ($status, $reserve, $all_reserves) = CheckReserves($itemnumber, $barcode); |
119 |
|
118 |
|
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 |
$bibitems, 1, $resdate, $expdate, $notes, |
225 |
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 |
$bibitems, 2, $resdate, $expdate, $notes, |
228 |
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 |
$bibitems, 3, $resdate, $expdate, $notes, |
231 |
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 248-260
is( $reserves[0]->borrowernumber(), $requesters{'RPL'}, 'GetWaiting got the rese
Link Here
|
248 |
|
247 |
|
249 |
$dbh->do("DELETE FROM reserves WHERE biblionumber=?",undef,($bibnum2)); |
248 |
$dbh->do("DELETE FROM reserves WHERE biblionumber=?",undef,($bibnum2)); |
250 |
AddReserve('RPL', $requesters{'RPL'}, $bibnum2, |
249 |
AddReserve('RPL', $requesters{'RPL'}, $bibnum2, |
251 |
$bibitems, 1, $resdate, $expdate, $notes, |
250 |
1, $resdate, $expdate, $notes, |
252 |
$title, $checkitem, $found); |
251 |
$title, $checkitem, $found); |
253 |
AddReserve('FPL', $requesters{'FPL'}, $bibnum2, |
252 |
AddReserve('FPL', $requesters{'FPL'}, $bibnum2, |
254 |
$bibitems, 2, $resdate, $expdate, $notes, |
253 |
2, $resdate, $expdate, $notes, |
255 |
$title, $checkitem, $found); |
254 |
$title, $checkitem, $found); |
256 |
AddReserve('CPL', $requesters{'CPL'}, $bibnum2, |
255 |
AddReserve('CPL', $requesters{'CPL'}, $bibnum2, |
257 |
$bibitems, 3, $resdate, $expdate, $notes, |
256 |
3, $resdate, $expdate, $notes, |
258 |
$title, $checkitem, $found); |
257 |
$title, $checkitem, $found); |
259 |
|
258 |
|
260 |
# Ensure that the item's home library controls hold policy lookup |
259 |
# Ensure that the item's home library controls hold policy lookup |
Lines 304-310
$resdate= undef; #defaults to today in AddReserve
Link Here
|
304 |
$expdate= undef; #no expdate |
303 |
$expdate= undef; #no expdate |
305 |
$dbh->do("DELETE FROM reserves WHERE biblionumber=?",undef,($bibnum)); |
304 |
$dbh->do("DELETE FROM reserves WHERE biblionumber=?",undef,($bibnum)); |
306 |
AddReserve('CPL', $requesters{'CPL'}, $bibnum, |
305 |
AddReserve('CPL', $requesters{'CPL'}, $bibnum, |
307 |
$bibitems, 1, $resdate, $expdate, $notes, |
306 |
1, $resdate, $expdate, $notes, |
308 |
$title, $checkitem, $found); |
307 |
$title, $checkitem, $found); |
309 |
($status)=CheckReserves($itemnumber,undef,undef); |
308 |
($status)=CheckReserves($itemnumber,undef,undef); |
310 |
is( $status, 'Reserved', 'CheckReserves returns reserve without lookahead'); |
309 |
is( $status, 'Reserved', 'CheckReserves returns reserve without lookahead'); |
Lines 319-325
$resdate->add_duration(DateTime::Duration->new(days => 4));
Link Here
|
319 |
$resdate=output_pref($resdate); |
318 |
$resdate=output_pref($resdate); |
320 |
$expdate= undef; #no expdate |
319 |
$expdate= undef; #no expdate |
321 |
AddReserve('CPL', $requesters{'CPL'}, $bibnum, |
320 |
AddReserve('CPL', $requesters{'CPL'}, $bibnum, |
322 |
$bibitems, 1, $resdate, $expdate, $notes, |
321 |
1, $resdate, $expdate, $notes, |
323 |
$title, $checkitem, $found); |
322 |
$title, $checkitem, $found); |
324 |
($status)=CheckReserves($itemnumber,undef,undef); |
323 |
($status)=CheckReserves($itemnumber,undef,undef); |
325 |
is( $status, '', 'CheckReserves returns no future reserve without lookahead'); |
324 |
is( $status, '', 'CheckReserves returns no future reserve without lookahead'); |
Lines 376-389
$resdate= dt_from_string();
Link Here
|
376 |
$resdate->add_duration(DateTime::Duration->new(days => 2)); |
375 |
$resdate->add_duration(DateTime::Duration->new(days => 2)); |
377 |
$resdate=output_pref($resdate); |
376 |
$resdate=output_pref($resdate); |
378 |
AddReserve('CPL', $requesters{'CPL'}, $bibnum, |
377 |
AddReserve('CPL', $requesters{'CPL'}, $bibnum, |
379 |
$bibitems, 1, $resdate, $expdate, $notes, |
378 |
1, $resdate, $expdate, $notes, |
380 |
$title, $checkitem, $found); |
379 |
$title, $checkitem, $found); |
381 |
my @results= GetReservesFromItemnumber($itemnumber); |
380 |
my @results= GetReservesFromItemnumber($itemnumber); |
382 |
is(defined $results[3]?1:0, 0, 'GetReservesFromItemnumber does not return a future next available hold'); |
381 |
is(defined $results[3]?1:0, 0, 'GetReservesFromItemnumber does not return a future next available hold'); |
383 |
# 9788b: GetReservesFromItemnumber does not return future item level hold |
382 |
# 9788b: GetReservesFromItemnumber does not return future item level hold |
384 |
$dbh->do("DELETE FROM reserves WHERE biblionumber=?",undef,($bibnum)); |
383 |
$dbh->do("DELETE FROM reserves WHERE biblionumber=?",undef,($bibnum)); |
385 |
AddReserve('CPL', $requesters{'CPL'}, $bibnum, |
384 |
AddReserve('CPL', $requesters{'CPL'}, $bibnum, |
386 |
$bibitems, 1, $resdate, $expdate, $notes, |
385 |
1, $resdate, $expdate, $notes, |
387 |
$title, $itemnumber, $found); #item level hold |
386 |
$title, $itemnumber, $found); #item level hold |
388 |
@results= GetReservesFromItemnumber($itemnumber); |
387 |
@results= GetReservesFromItemnumber($itemnumber); |
389 |
is(defined $results[3]?1:0, 0, 'GetReservesFromItemnumber does not return a future item level hold'); |
388 |
is(defined $results[3]?1:0, 0, 'GetReservesFromItemnumber does not return a future item level hold'); |
Lines 398-404
my $p = C4::Reserves::CalculatePriority($bibnum2);
Link Here
|
398 |
is($p, 4, 'CalculatePriority should now return priority 4'); |
397 |
is($p, 4, 'CalculatePriority should now return priority 4'); |
399 |
$resdate=undef; |
398 |
$resdate=undef; |
400 |
AddReserve('CPL', $requesters{'CPL'}, $bibnum2, |
399 |
AddReserve('CPL', $requesters{'CPL'}, $bibnum2, |
401 |
$bibitems, $p, $resdate, $expdate, $notes, |
400 |
$p, $resdate, $expdate, $notes, |
402 |
$title, $checkitem, $found); |
401 |
$title, $checkitem, $found); |
403 |
$p = C4::Reserves::CalculatePriority($bibnum2); |
402 |
$p = C4::Reserves::CalculatePriority($bibnum2); |
404 |
is($p, 5, 'CalculatePriority should now return priority 5'); |
403 |
is($p, 5, 'CalculatePriority should now return priority 5'); |
Lines 408-414
$p = C4::Reserves::CalculatePriority($bibnum);
Link Here
|
408 |
is($p, 1, 'CalculatePriority should now return priority 1'); |
407 |
is($p, 1, 'CalculatePriority should now return priority 1'); |
409 |
#add a new reserve and confirm it to waiting |
408 |
#add a new reserve and confirm it to waiting |
410 |
AddReserve('CPL', $requesters{'CPL'}, $bibnum, |
409 |
AddReserve('CPL', $requesters{'CPL'}, $bibnum, |
411 |
$bibitems, $p, $resdate, $expdate, $notes, |
410 |
$p, $resdate, $expdate, $notes, |
412 |
$title, $itemnumber, $found); |
411 |
$title, $itemnumber, $found); |
413 |
$p = C4::Reserves::CalculatePriority($bibnum); |
412 |
$p = C4::Reserves::CalculatePriority($bibnum); |
414 |
is($p, 2, 'CalculatePriority should now return priority 2'); |
413 |
is($p, 2, 'CalculatePriority should now return priority 2'); |
Lines 417-423
$p = C4::Reserves::CalculatePriority($bibnum);
Link Here
|
417 |
is($p, 1, 'CalculatePriority should now return priority 1'); |
416 |
is($p, 1, 'CalculatePriority should now return priority 1'); |
418 |
#add another biblio hold, no resdate |
417 |
#add another biblio hold, no resdate |
419 |
AddReserve('CPL', $requesters{'CPL'}, $bibnum, |
418 |
AddReserve('CPL', $requesters{'CPL'}, $bibnum, |
420 |
$bibitems, $p, $resdate, $expdate, $notes, |
419 |
$p, $resdate, $expdate, $notes, |
421 |
$title, $checkitem, $found); |
420 |
$title, $checkitem, $found); |
422 |
$p = C4::Reserves::CalculatePriority($bibnum); |
421 |
$p = C4::Reserves::CalculatePriority($bibnum); |
423 |
is($p, 2, 'CalculatePriority should now return priority 2'); |
422 |
is($p, 2, 'CalculatePriority should now return priority 2'); |
Lines 426-432
C4::Context->set_preference('AllowHoldDateInFuture', 1);
Link Here
|
426 |
$resdate= dt_from_string(); |
425 |
$resdate= dt_from_string(); |
427 |
$resdate->add_duration(DateTime::Duration->new(days => 1)); |
426 |
$resdate->add_duration(DateTime::Duration->new(days => 1)); |
428 |
AddReserve('CPL', $requesters{'CPL'}, $bibnum, |
427 |
AddReserve('CPL', $requesters{'CPL'}, $bibnum, |
429 |
$bibitems, $p, output_pref($resdate), $expdate, $notes, |
428 |
$p, output_pref($resdate), $expdate, $notes, |
430 |
$title, $checkitem, $found); |
429 |
$title, $checkitem, $found); |
431 |
$p = C4::Reserves::CalculatePriority($bibnum); |
430 |
$p = C4::Reserves::CalculatePriority($bibnum); |
432 |
is($p, 2, 'CalculatePriority should now still return priority 2'); |
431 |
is($p, 2, 'CalculatePriority should now still return priority 2'); |
Lines 438-444
is($p, 3, 'CalculatePriority should now return priority 3');
Link Here
|
438 |
# Tests for cancel reserves by users from OPAC. |
437 |
# Tests for cancel reserves by users from OPAC. |
439 |
$dbh->do('DELETE FROM reserves', undef, ($bibnum)); |
438 |
$dbh->do('DELETE FROM reserves', undef, ($bibnum)); |
440 |
AddReserve('CPL', $requesters{'CPL'}, $item_bibnum, |
439 |
AddReserve('CPL', $requesters{'CPL'}, $item_bibnum, |
441 |
$bibitems, 1, undef, $expdate, $notes, |
440 |
1, undef, $expdate, $notes, |
442 |
$title, $checkitem, ''); |
441 |
$title, $checkitem, ''); |
443 |
my (undef, $canres, undef) = CheckReserves($itemnumber); |
442 |
my (undef, $canres, undef) = CheckReserves($itemnumber); |
444 |
|
443 |
|
Lines 468-474
is($cancancel, 0, 'Reserve in transfer status cant be canceled');
Link Here
|
468 |
|
467 |
|
469 |
$dbh->do('DELETE FROM reserves', undef, ($bibnum)); |
468 |
$dbh->do('DELETE FROM reserves', undef, ($bibnum)); |
470 |
AddReserve('CPL', $requesters{'CPL'}, $item_bibnum, |
469 |
AddReserve('CPL', $requesters{'CPL'}, $item_bibnum, |
471 |
$bibitems, 1, undef, $expdate, $notes, |
470 |
1, undef, $expdate, $notes, |
472 |
$title, $checkitem, ''); |
471 |
$title, $checkitem, ''); |
473 |
(undef, $canres, undef) = CheckReserves($itemnumber); |
472 |
(undef, $canres, undef) = CheckReserves($itemnumber); |
474 |
|
473 |
|
Lines 545-551
my $bz14464_reserve = AddReserve(
Link Here
|
545 |
'CPL', |
544 |
'CPL', |
546 |
$borrowernumber, |
545 |
$borrowernumber, |
547 |
$bibnum, |
546 |
$bibnum, |
548 |
undef, |
|
|
549 |
'1', |
547 |
'1', |
550 |
undef, |
548 |
undef, |
551 |
undef, |
549 |
undef, |
Lines 569-575
$bz14464_reserve = AddReserve(
Link Here
|
569 |
'CPL', |
567 |
'CPL', |
570 |
$borrowernumber, |
568 |
$borrowernumber, |
571 |
$bibnum, |
569 |
$bibnum, |
572 |
undef, |
|
|
573 |
'1', |
570 |
'1', |
574 |
undef, |
571 |
undef, |
575 |
undef, |
572 |
undef, |
Lines 591-597
$bz14464_reserve = AddReserve(
Link Here
|
591 |
'CPL', |
588 |
'CPL', |
592 |
$borrowernumber, |
589 |
$borrowernumber, |
593 |
$bibnum, |
590 |
$bibnum, |
594 |
undef, |
|
|
595 |
'1', |
591 |
'1', |
596 |
undef, |
592 |
undef, |
597 |
undef, |
593 |
undef, |