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

(-)a/C4/Reserves.pm (-1 / +2 lines)
Lines 2178-2184 sub ReserveSlip { Link Here
2178
        biblionumber => $biblionumber,
2178
        biblionumber => $biblionumber,
2179
        borrowernumber => $borrowernumber
2179
        borrowernumber => $borrowernumber
2180
    }) or return;
2180
    }) or return;
2181
    my $reserve = GetReserveInfo($reserve_id) or return;
2181
    my $reserve = Koha::Holds->find($reserve_id) or return;
2182
    $reserve = $reserve->unblessed;
2182
2183
2183
    return  C4::Letters::GetPreparedLetter (
2184
    return  C4::Letters::GetPreparedLetter (
2184
        module => 'circulation',
2185
        module => 'circulation',
(-)a/t/db_dependent/Holds.t (-7 / +2 lines)
Lines 7-13 use t::lib::TestBuilder; Link Here
7
7
8
use C4::Context;
8
use C4::Context;
9
9
10
use Test::More tests => 58;
10
use Test::More tests => 57;
11
use MARC::Record;
11
use MARC::Record;
12
use C4::Biblio;
12
use C4::Biblio;
13
use C4::Items;
13
use C4::Items;
Lines 211-221 ModReserveMinusPriority( $itemnumber, $reserve->{'reserve_id'} ); Link Here
211
$holds = $patron->holds;
211
$holds = $patron->holds;
212
is( $holds->next->itemnumber, $itemnumber, "Test ModReserveMinusPriority()" );
212
is( $holds->next->itemnumber, $itemnumber, "Test ModReserveMinusPriority()" );
213
213
214
215
my $reserve2 = GetReserveInfo( $reserve->{'reserve_id'} );
216
ok( $reserve->{'reserve_id'} eq $reserve2->{'reserve_id'}, "Test GetReserveInfo()" );
217
218
219
$holds = $biblio->holds;
214
$holds = $biblio->holds;
220
$hold = $holds->next;
215
$hold = $holds->next;
221
AlterPriority( 'top', $hold->reserve_id );
216
AlterPriority( 'top', $hold->reserve_id );
Lines 323-329 my $reserveid2 = C4::Reserves::GetReserveId( Link Here
323
318
324
CancelReserve({ reserve_id => $reserveid1 });
319
CancelReserve({ reserve_id => $reserveid1 });
325
320
326
$reserve2 = GetReserve( $reserveid2 );
321
my $reserve2 = GetReserve( $reserveid2 );
327
is( $reserve2->{priority}, 1, "After cancelreserve, the 2nd reserve becomes the first on the waiting list" );
322
is( $reserve2->{priority}, 1, "After cancelreserve, the 2nd reserve becomes the first on the waiting list" );
328
323
329
($item_bibnum, $item_bibitemnum, $itemnumber) = AddItem({ homebranch => $branch_1, holdingbranch => $branch_1 } , $bibnum);
324
($item_bibnum, $item_bibitemnum, $itemnumber) = AddItem({ homebranch => $branch_1, holdingbranch => $branch_1 } , $bibnum);
(-)a/t/db_dependent/Reserves/GetReserveFee.t (-2 lines)
Lines 193-199 subtest 'Integration with AddIssue' => sub { Link Here
193
193
194
    $dbh->do( "DELETE FROM issues       WHERE borrowernumber = ?", undef, $patron1->{borrowernumber} );
194
    $dbh->do( "DELETE FROM issues       WHERE borrowernumber = ?", undef, $patron1->{borrowernumber} );
195
    my $id = addreserve( $patron1->{borrowernumber} );
195
    my $id = addreserve( $patron1->{borrowernumber} );
196
    my $r = C4::Reserves::GetReserveInfo($id);
197
    is( acctlines( $patron1->{borrowernumber} ), 0, 'any_time_is_collected - Patron should not be charged yet (just checking to make sure)');
196
    is( acctlines( $patron1->{borrowernumber} ), 0, 'any_time_is_collected - Patron should not be charged yet (just checking to make sure)');
198
    C4::Circulation::AddIssue( $patron1, $item1->{barcode}, '2015-12-31', 0, undef, 0, {} );
197
    C4::Circulation::AddIssue( $patron1, $item1->{barcode}, '2015-12-31', 0, undef, 0, {} );
199
    is( acctlines( $patron1->{borrowernumber} ), 1, 'any_time_is_collected - Patron should not be charged when checking out an item which was not placed hold for him' );
198
    is( acctlines( $patron1->{borrowernumber} ), 1, 'any_time_is_collected - Patron should not be charged when checking out an item which was not placed hold for him' );
200
- 

Return to bug 19025