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

(-)a/Koha/Hold.pm (+14 lines)
Lines 645-650 sub cancellation_requests { Link Here
645
    return Koha::Hold::CancellationRequests->search( { hold_id => $self->id } );
645
    return Koha::Hold::CancellationRequests->search( { hold_id => $self->id } );
646
}
646
}
647
647
648
=head3 cancellation_requested
649
650
    if ( $hold->cancellation_requested ) { ... }
651
652
Returns true if a cancellation request has been placed for the hold.
653
654
=cut
655
656
sub cancellation_requested {
657
    my ($self) = @_;
658
659
    return Koha::Hold::CancellationRequests->search( { hold_id => $self->id } )->count > 0;
660
}
661
648
=head3 cancel
662
=head3 cancel
649
663
650
my $cancel_hold = $hold->cancel(
664
my $cancel_hold = $hold->cancel(
(-)a/t/db_dependent/Koha/Hold.t (-3 / +4 lines)
Lines 728-736 subtest 'suspend_hold() and resume() tests' => sub { Link Here
728
    $schema->storage->txn_rollback;
728
    $schema->storage->txn_rollback;
729
};
729
};
730
730
731
subtest 'cancellation_requests() and add_cancellation_request() tests' => sub {
731
subtest 'cancellation_requests(), add_cancellation_request() and cancellation_requested() tests' => sub {
732
732
733
    plan tests => 4;
733
    plan tests => 6;
734
734
735
    $schema->storage->txn_begin;
735
    $schema->storage->txn_begin;
736
736
Lines 739-744 subtest 'cancellation_requests() and add_cancellation_request() tests' => sub { Link Here
739
    my $hold = $builder->build_object( { class => 'Koha::Holds', } );
739
    my $hold = $builder->build_object( { class => 'Koha::Holds', } );
740
740
741
    is( $hold->cancellation_requests->count, 0 );
741
    is( $hold->cancellation_requests->count, 0 );
742
    ok( !$hold->cancellation_requested );
742
743
743
    # Add two cancellation requests
744
    # Add two cancellation requests
744
    my $request_1 = $hold->add_cancellation_request;
745
    my $request_1 = $hold->add_cancellation_request;
Lines 756-761 subtest 'cancellation_requests() and add_cancellation_request() tests' => sub { Link Here
756
    is( $request_2->creation_date, $creation_date, 'Passed creation_date set' );
757
    is( $request_2->creation_date, $creation_date, 'Passed creation_date set' );
757
758
758
    is( $hold->cancellation_requests->count, 2 );
759
    is( $hold->cancellation_requests->count, 2 );
760
    ok( $hold->cancellation_requested );
759
761
760
    $schema->storage->txn_rollback;
762
    $schema->storage->txn_rollback;
761
};
763
};
762
- 

Return to bug 34333