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

(-)a/C4/Reserves.pm (-1 / +48 lines)
Lines 1224-1235 sub ModReserveAffect { Link Here
1224
        $hold->set_processing();
1224
        $hold->set_processing();
1225
    } else {
1225
    } else {
1226
        $hold->set_waiting($desk_id);
1226
        $hold->set_waiting($desk_id);
1227
        _koha_notify_reserve( $hold->reserve_id, $notify_library ) unless $already_on_shelf;
1227
        _koha_notify_reserve( $hold->reserve_id ) unless $already_on_shelf;
1228
        # Complete transfer if one exists
1228
        # Complete transfer if one exists
1229
        my $transfer = $hold->item->get_transfer;
1229
        my $transfer = $hold->item->get_transfer;
1230
        $transfer->receive if $transfer;
1230
        $transfer->receive if $transfer;
1231
    }
1231
    }
1232
1232
1233
    _koha_notify_hold_changed( $hold ) if $notify_library;
1234
1233
    _FixPriority( { biblionumber => $biblionumber } );
1235
    _FixPriority( { biblionumber => $biblionumber } );
1234
    my $item = Koha::Items->find($itemnumber);
1236
    my $item = Koha::Items->find($itemnumber);
1235
    if ( $item->location && $item->location eq 'CART'
1237
    if ( $item->location && $item->location eq 'CART'
Lines 1949-1954 sub _koha_notify_reserve { Link Here
1949
    }
1951
    }
1950
}
1952
}
1951
1953
1954
=head2 _koha_notify_hold_changed
1955
1956
  _koha_notify_hold_changed( $hold_object );
1957
1958
=cut
1959
1960
sub _koha_notify_hold_changed {
1961
    my $hold = shift;
1962
1963
    my $patron = $hold->patron;
1964
    my $library = $hold->branch;
1965
1966
    my $letter = C4::Letters::GetPreparedLetter(
1967
        module      => 'reserves',
1968
        letter_code => 'HOLD_CHANGED',
1969
        branchcode  => $hold->branchcode,
1970
        substitute  => { today => output_pref( dt_from_string ) },
1971
        tables      => {
1972
            'branches'    => $library->unblessed,
1973
            'borrowers'   => $patron->unblessed,
1974
            'biblio'      => $hold->biblionumber,
1975
            'biblioitems' => $hold->biblionumber,
1976
            'reserves'    => $hold->unblessed,
1977
            'items'       => $hold->itemnumber,
1978
        },
1979
    );
1980
1981
    return unless $letter;
1982
1983
    my $email =
1984
         C4::Context->preference('ExpireReservesAutoFillEmail')
1985
      || $library->branchemail
1986
      || C4::Context->preference('KohaAdminEmailAddress');
1987
1988
    C4::Letters::EnqueueLetter(
1989
        {
1990
            letter                 => $letter,
1991
            borrowernumber         => $patron->id,
1992
            message_transport_type => 'email',
1993
            from_address           => $email,
1994
            to_address             => $email,
1995
        }
1996
    );
1997
}
1998
1952
=head2 _ShiftPriorityByDateAndPriority
1999
=head2 _ShiftPriorityByDateAndPriority
1953
2000
1954
  $new_priority = _ShiftPriorityByDateAndPriority( $biblionumber, $reservedate, $priority );
2001
  $new_priority = _ShiftPriorityByDateAndPriority( $biblionumber, $reservedate, $priority );
(-)a/t/db_dependent/Holds/ExpireReservesAutoFill.t (-9 / +8 lines)
Lines 100-110 subtest 'Test automatically canceled expired waiting holds to fill the next hold Link Here
100
100
101
    CancelExpiredReserves();
101
    CancelExpiredReserves();
102
102
103
    my @holds = Koha::Holds->search( {}, { order_by => 'priority' } );
103
    my $holds = Koha::Holds->search( {}, { order_by => 'priority' } );
104
    $hold_2 = $holds[0];
104
    $hold_2 = $holds->next;
105
    $hold_3 = $holds[1];
105
    $hold_3 = $holds->next;
106
106
107
    is( @holds,            2,   'Found 2 holds' );
107
    is( $holds->count,     2,   'Found 2 holds' );
108
    is( $hold_2->priority, 0,   'Next hold in line now has priority of 0' );
108
    is( $hold_2->priority, 0,   'Next hold in line now has priority of 0' );
109
    is( $hold_2->found,    'W', 'Next hold in line is now set to waiting' );
109
    is( $hold_2->found,    'W', 'Next hold in line is now set to waiting' );
110
110
Lines 117-126 subtest 'Test automatically canceled expired waiting holds to fill the next hold Link Here
117
117
118
    CancelExpiredReserves();
118
    CancelExpiredReserves();
119
119
120
    @holds = Koha::Holds->search( {}, { order_by => 'priority' } );
120
    $holds = Koha::Holds->search( {}, { order_by => 'priority' } );
121
    $hold_3 = $holds[0];
121
    $hold_3 = $holds->next;
122
122
123
    is( @holds,            1,   'Found 1 hold' );
123
    is( $holds->count,     1,   'Found 1 hold' );
124
    is( $hold_3->priority, 0,   'Next hold in line now has priority of 0' );
124
    is( $hold_3->priority, 0,   'Next hold in line now has priority of 0' );
125
    is( $hold_3->found,    'W', 'Next hold in line is now set to waiting' );
125
    is( $hold_3->found,    'W', 'Next hold in line is now set to waiting' );
126
126
Lines 186-190 subtest 'Test automatically canceled expired waiting holds to fill the next hold Link Here
186
186
187
    my @messages = $schema->resultset('MessageQueue')
187
    my @messages = $schema->resultset('MessageQueue')
188
      ->search( { letter_code => 'HOLD_CHANGED' } );
188
      ->search( { letter_code => 'HOLD_CHANGED' } );
189
    is( @messages, 0, 'No messages in the message queue when generating transfer' );
189
    is( @messages, 1, 'Nessage is generated in the message queue when generating transfer' );
190
};
190
};
191
- 

Return to bug 14364