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

(-)a/C4/Reserves.pm (-8 / +13 lines)
Lines 1093-1106 sub CancelReserveFromId { Link Here
1093
            WHERE reserve_id = ?
1093
            WHERE reserve_id = ?
1094
        };
1094
        };
1095
        $sth = $dbh->prepare($query);
1095
        $sth = $dbh->prepare($query);
1096
        $sth->execute($reserve_id);
1096
        my $rv = $sth->execute($reserve_id);
1097
1097
1098
        $query = qq{
1098
        if ($rv) {
1099
            DELETE FROM reserves
1099
            $query = qq{
1100
            WHERE reserve_id = ?
1100
                DELETE FROM reserves
1101
        };
1101
                WHERE reserve_id = ?
1102
        $sth = $dbh->prepare($query);
1102
            };
1103
        $sth->execute($reserve_id);
1103
            $sth = $dbh->prepare($query);
1104
            $sth->execute($reserve_id);
1105
        } else {
1106
            warn "ERROR: Failed to move reserve $reserve_id to table old_reserves.";
1107
            return;
1108
        }
1104
1109
1105
        # now fix the priority on the others...
1110
        # now fix the priority on the others...
1106
        _FixPriority( $reserve->{biblionumber}, $reserve->{borrowernumber} );
1111
        _FixPriority( $reserve->{biblionumber}, $reserve->{borrowernumber} );
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tt (-1 / +1 lines)
Lines 671-677 Link Here
671
                    <dt><strong>patron_id</strong> (Required)</dt>
671
                    <dt><strong>patron_id</strong> (Required)</dt>
672
                    <dd>the unique patron identifier in the ILS; the same identifier returned by LookupPatron or AuthenticatePatron</dd>
672
                    <dd>the unique patron identifier in the ILS; the same identifier returned by LookupPatron or AuthenticatePatron</dd>
673
                    <dt><strong>item_id</strong> (Required)</dt>
673
                    <dt><strong>item_id</strong> (Required)</dt>
674
                    <dd>system item identifier</dd>
674
                    <dd>system hold identifier (returned by GetRecords and GetPatronInfo into element 'reserve_id')</dd>
675
                </dl>
675
                </dl>
676
                <h4>Example call</h4>
676
                <h4>Example call</h4>
677
                <a href="ilsdi.pl?service=CancelHold&amp;patron_id=1&amp;item_id=1">
677
                <a href="ilsdi.pl?service=CancelHold&amp;patron_id=1&amp;item_id=1">
(-)a/t/db_dependent/Reserves.t (-2 / +20 lines)
Lines 2-8 Link Here
2
2
3
use Modern::Perl;
3
use Modern::Perl;
4
4
5
use Test::More tests => 8;
5
use Test::More tests => 16;
6
use MARC::Record;
6
use MARC::Record;
7
7
8
use C4::Branch;
8
use C4::Branch;
Lines 199-201 is( $messages->{ResFound}->{borrowernumber}, Link Here
199
is( $messages->{ResFound}->{borrowernumber},
199
is( $messages->{ResFound}->{borrowernumber},
200
    $requesters{'RPL'},
200
    $requesters{'RPL'},
201
    'for generous library, its items fill first hold request in line (bug 10272)');
201
    'for generous library, its items fill first hold request in line (bug 10272)');
202
- 
202
203
my (undef, $reserves) = GetReservesFromBiblionumber($biblionumber);
204
isa_ok($reserves, 'ARRAY');
205
is(scalar @$reserves, 1, "Only one reserves for this biblio");
206
my $reserve_id = $reserves->[0]->{reserve_id};
207
208
$reserve = GetReserve($reserve_id);
209
isa_ok($reserve, 'HASH', "GetReserve return");
210
is($reserve->{biblionumber}, $biblionumber);
211
212
$reserve = CancelReserveFromId($reserve_id);
213
isa_ok($reserve, 'HASH', "CancelReserveFromId return");
214
is($reserve->{biblionumber}, $biblionumber);
215
216
$reserve = GetReserve($reserve_id);
217
is($reserve, undef, "GetReserve returns undef after deletion");
218
219
$reserve = CancelReserveFromId($reserve_id);
220
is($reserve, undef, "CancelReserveFromId return undef if reserve does not exist");

Return to bug 8868