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

(-)a/C4/Reserves.pm (-2 / +2 lines)
Lines 2022-2028 sub MoveReserve { Link Here
2022
2022
2023
    if ($res->{borrowernumber} == $borrowernumber) {
2023
    if ($res->{borrowernumber} == $borrowernumber) {
2024
        my $hold = Koha::Holds->find( $res->{reserve_id} );
2024
        my $hold = Koha::Holds->find( $res->{reserve_id} );
2025
        $hold->fill({ itemnumber => $itemnumber });
2025
        $hold->fill({ item_id => $itemnumber });
2026
    }
2026
    }
2027
    else {
2027
    else {
2028
        # warn "Reserved";
2028
        # warn "Reserved";
Lines 2038-2044 sub MoveReserve { Link Here
2038
2038
2039
        if ( $borr_res ) {
2039
        if ( $borr_res ) {
2040
            # The item is reserved by the current patron
2040
            # The item is reserved by the current patron
2041
            $borr_res->fill({ itemnumber => $itemnumber });
2041
            $borr_res->fill({ item_id => $itemnumber });
2042
        }
2042
        }
2043
2043
2044
        if ( $cancelreserve eq 'revert' ) { ## Revert waiting reserve to priority 1
2044
        if ( $cancelreserve eq 'revert' ) { ## Revert waiting reserve to priority 1
(-)a/Koha/Hold.pm (-3 / +4 lines)
Lines 776-785 sub cancel { Link Here
776
776
777
=head3 fill
777
=head3 fill
778
778
779
    $hold->fill;
779
    $hold->fill({ [ item_id => $item->id ] });
780
    $hold->fill({ itemnumber => $i }); # optional itemnumber: see MoveReserves
781
780
782
This method marks the hold as filled. It effectively moves it to old_reserves.
781
This method marks the hold as filled. It effectively moves it to old_reserves.
782
The optional I<item_id> parameter is used to set the information about the
783
item that filled the hold.
783
784
784
=cut
785
=cut
785
786
Lines 793-799 sub fill { Link Here
793
                {
794
                {
794
                    found    => 'F',
795
                    found    => 'F',
795
                    priority => 0,
796
                    priority => 0,
796
                    $params->{itemnumber} ? ( itemnumber => $params->{itemnumber} ) : (),
797
                    $params->{item_id} ? ( itemnumber => $params->{item_id} ) : (),
797
                }
798
                }
798
            );
799
            );
799
800
(-)a/t/db_dependent/Koha/Hold.t (-3 / +2 lines)
Lines 124-135 subtest 'fill() tests' => sub { Link Here
124
    is( $old_hold->priority, 0, 'priority set to 0' );
124
    is( $old_hold->priority, 0, 'priority set to 0' );
125
    is( $old_hold->found, 'F', 'found set to F' );
125
    is( $old_hold->found, 'F', 'found set to F' );
126
126
127
    subtest 'itemnumber parameter' => sub {
127
    subtest 'item_id parameter' => sub {
128
        plan tests => 1;
128
        plan tests => 1;
129
        $category->reservefee(0)->store; # do not disturb later accounts
129
        $category->reservefee(0)->store; # do not disturb later accounts
130
        $hold = $builder->build_object({ class => 'Koha::Holds', value => { biblionumber => $biblio->id, borrowernumber => $patron->id, itemnumber => undef, priority => 1 } });
130
        $hold = $builder->build_object({ class => 'Koha::Holds', value => { biblionumber => $biblio->id, borrowernumber => $patron->id, itemnumber => undef, priority => 1 } });
131
        # Simulating checkout without confirming hold
131
        # Simulating checkout without confirming hold
132
        $hold->fill({ itemnumber => $item->id });
132
        $hold->fill({ item_id => $item->id });
133
        $old_hold = Koha::Old::Holds->find($hold->id);
133
        $old_hold = Koha::Old::Holds->find($hold->id);
134
        is( $old_hold->itemnumber, $item->itemnumber, 'The itemnumber has been saved in old_reserves by fill' );
134
        is( $old_hold->itemnumber, $item->itemnumber, 'The itemnumber has been saved in old_reserves by fill' );
135
        $old_hold->delete;
135
        $old_hold->delete;
136
- 

Return to bug 33791