View | Details | Raw Unified | Return to bug 14526
Collapse All | Expand All

(-)a/t/db_dependent/Reserves.t (-2 / +52 lines)
Lines 17-23 Link Here
17
17
18
use Modern::Perl;
18
use Modern::Perl;
19
19
20
use Test::More tests => 65;
20
use Test::More tests => 71;
21
21
22
use MARC::Record;
22
use MARC::Record;
23
use DateTime::Duration;
23
use DateTime::Duration;
Lines 608-613 CancelReserve({ reserve_id => $bz14464_reserve, charge_cancel_fee => 1 }); Link Here
608
( undef, undef, $bz14464_fines ) = GetMemberIssuesAndFines( $borrowernumber );
608
( undef, undef, $bz14464_fines ) = GetMemberIssuesAndFines( $borrowernumber );
609
is( int( $bz14464_fines ), 42, 'Bug 14464 - Fine applied after cancelling reserve with charge desired and configured' );
609
is( int( $bz14464_fines ), 42, 'Bug 14464 - Fine applied after cancelling reserve with charge desired and configured' );
610
610
611
# tests for MoveReserve in relation to ConfirmFutureHolds (BZ 14526)
612
#   hold from A pos 1, today, no fut holds: MoveReserve should fill it
613
$dbh->do('DELETE FROM reserves', undef, ($bibnum));
614
C4::Context->set_preference('ConfirmFutureHolds', 0);
615
C4::Context->set_preference('AllowHoldDateInFuture', 1);
616
AddReserve('CPL',  $borrowernumber, $item_bibnum,
617
    $bibitems,  1, undef, $expdate, $notes, $title, $checkitem, '');
618
MoveReserve( $itemnumber, $borrowernumber );
619
($status)=CheckReserves( $itemnumber );
620
is( $status, '', 'MoveReserve filled hold');
621
#   hold from A waiting, today, no fut holds: MoveReserve should fill it
622
AddReserve('CPL',  $borrowernumber, $item_bibnum,
623
   $bibitems,  1, undef, $expdate, $notes, $title, $checkitem, 'W');
624
MoveReserve( $itemnumber, $borrowernumber );
625
($status)=CheckReserves( $itemnumber );
626
is( $status, '', 'MoveReserve filled waiting hold');
627
#   hold from A pos 1, tomorrow, no fut holds: not filled
628
$resdate= dt_from_string();
629
$resdate->add_duration(DateTime::Duration->new(days => 1));
630
$resdate=output_pref($resdate);
631
AddReserve('CPL',  $borrowernumber, $item_bibnum,
632
    $bibitems,  1, $resdate, $expdate, $notes, $title, $checkitem, '');
633
MoveReserve( $itemnumber, $borrowernumber );
634
($status)=CheckReserves( $itemnumber, undef, 1 );
635
is( $status, 'Reserved', 'MoveReserve did not fill future hold');
636
$dbh->do('DELETE FROM reserves', undef, ($bibnum));
637
#   hold from A pos 1, tomorrow, fut holds=2: MoveReserve should fill it
638
C4::Context->set_preference('ConfirmFutureHolds', 2);
639
AddReserve('CPL',  $borrowernumber, $item_bibnum,
640
    $bibitems,  1, $resdate, $expdate, $notes, $title, $checkitem, '');
641
MoveReserve( $itemnumber, $borrowernumber );
642
($status)=CheckReserves( $itemnumber, undef, 2 );
643
is( $status, '', 'MoveReserve filled future hold now');
644
#   hold from A waiting, tomorrow, fut holds=2: MoveReserve should fill it
645
AddReserve('CPL',  $borrowernumber, $item_bibnum,
646
    $bibitems,  1, $resdate, $expdate, $notes, $title, $checkitem, 'W');
647
MoveReserve( $itemnumber, $borrowernumber );
648
($status)=CheckReserves( $itemnumber, undef, 2 );
649
is( $status, '', 'MoveReserve filled future waiting hold now');
650
#   hold from A pos 1, today+3, fut holds=2: MoveReserve should not fill it
651
$resdate= dt_from_string();
652
$resdate->add_duration(DateTime::Duration->new(days => 3));
653
$resdate=output_pref($resdate);
654
AddReserve('CPL',  $borrowernumber, $item_bibnum,
655
    $bibitems,  1, $resdate, $expdate, $notes, $title, $checkitem, '');
656
MoveReserve( $itemnumber, $borrowernumber );
657
($status)=CheckReserves( $itemnumber, undef, 3 );
658
is( $status, 'Reserved', 'MoveReserve did not fill future hold of 3 days');
659
$dbh->do('DELETE FROM reserves', undef, ($bibnum));
660
661
# we reached the finish
611
$dbh->rollback;
662
$dbh->rollback;
612
663
613
sub count_hold_print_messages {
664
sub count_hold_print_messages {
614
- 

Return to bug 14526