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

(-)a/C4/Reserves.pm (-1 / +18 lines)
Lines 304-309 are excluded from the list. Link Here
304
=cut
304
=cut
305
305
306
sub GetReservesFromBiblionumber {
306
sub GetReservesFromBiblionumber {
307
308
307
    my ( $params ) = @_;
309
    my ( $params ) = @_;
308
    my $biblionumber = $params->{biblionumber} or return [];
310
    my $biblionumber = $params->{biblionumber} or return [];
309
    my $itemnumber = $params->{itemnumber};
311
    my $itemnumber = $params->{itemnumber};
Lines 632-646 sub GetReserveCount { Link Here
632
634
633
    my $dbh = C4::Context->dbh;
635
    my $dbh = C4::Context->dbh;
634
636
637
    my $count = 0;
635
    my $query = "
638
    my $query = "
636
        SELECT COUNT(*) AS counter
639
        SELECT COUNT(*) AS counter
637
        FROM reserves
640
        FROM reserves
638
        WHERE borrowernumber = ?
641
        WHERE borrowernumber = ?
642
        AND reserve_group_id is NULL
639
    ";
643
    ";
640
    my $sth = $dbh->prepare($query);
644
    my $sth = $dbh->prepare($query);
641
    $sth->execute($borrowernumber);
645
    $sth->execute($borrowernumber);
642
    my $row = $sth->fetchrow_hashref;
646
    my $row = $sth->fetchrow_hashref;
643
    return $row->{counter};
647
    $count += $row->{counter};
648
649
    $query = "
650
        SELECT COUNT(DISTINCT reserve_group_id) AS counter
651
        FROM reserves
652
        WHERE borrowernumber = ?
653
        AND reserve_group_id is not NULL
654
    ";
655
    $sth = $dbh->prepare($query);
656
    $sth->execute($borrowernumber);
657
    $row = $sth->fetchrow_hashref;
658
    $count += $row->{counter};
659
660
    return $count;
644
}
661
}
645
662
646
=head2 GetOtherReserves
663
=head2 GetOtherReserves
(-)a/opac/opac-reserve.pl (-3 / +3 lines)
Lines 188-194 foreach my $biblioNumber (@biblionumbers) { Link Here
188
if ( $query->param('place_reserve') ) {
188
if ( $query->param('place_reserve') ) {
189
    my $reserve_cnt = 0;
189
    my $reserve_cnt = 0;
190
    if ($maxreserves) {
190
    if ($maxreserves) {
191
        $reserve_cnt = GetReservesFromBorrowernumber( $borrowernumber );
191
        $reserve_cnt = GetReserveCount( $borrowernumber );
192
    }
192
    }
193
193
194
    # List is composed of alternating biblio/item/branch
194
    # List is composed of alternating biblio/item/branch
Lines 341-352 if ( Koha::Patrons->find( $borrowernumber )->is_debarred ) { Link Here
341
}
341
}
342
342
343
my @reserves = GetReservesFromBorrowernumber( $borrowernumber );
343
my @reserves = GetReservesFromBorrowernumber( $borrowernumber );
344
my $reserves_count = scalar(@reserves);
344
my $reserves_count = GetReserveCount($borrowernumber);
345
$template->param( RESERVES => \@reserves );
345
$template->param( RESERVES => \@reserves );
346
if ( $maxreserves && ( $reserves_count >= $maxreserves ) ) {
346
if ( $maxreserves && ( $reserves_count >= $maxreserves ) ) {
347
    $template->param( message => 1 );
347
    $template->param( message => 1 );
348
    $noreserves = 1;
348
    $noreserves = 1;
349
    $template->param( too_many_reserves => scalar(@reserves));
349
    $template->param( too_many_reserves => $reserves_count);
350
}
350
}
351
351
352
unless ( $noreserves ) {
352
unless ( $noreserves ) {
(-)a/t/db_dependent/Reserves/ReserveCount.t (-1 / +116 lines)
Line 0 Link Here
0
- 
1
#!/usr/bin/perl
2
3
# This file is part of Koha.
4
#
5
# Koha is free software; you can redistribute it and/or modify it under the
6
# terms of the GNU General Public License as published by the Free Software
7
# Foundation; either version 3 of the License, or (at your option) any later
8
# version.
9
#
10
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
11
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
12
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
13
#
14
# You should have received a copy of the GNU General Public License along
15
# with Koha; if not, write to the Free Software Foundation, Inc.,
16
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17
18
use Modern::Perl;
19
20
use Test::More tests => 3;
21
use t::lib::TestBuilder;
22
23
use C4::Context;
24
use C4::Biblio;
25
use C4::Items;
26
use C4::Reserves;
27
28
use Koha::Database;
29
30
31
32
my $dbh = C4::Context->dbh;
33
$dbh->{AutoCommit} = 0;
34
$dbh->{RaiseError} = 1;
35
36
my $builder = t::lib::TestBuilder->new();
37
38
my $categorycode = $builder->build({ source => 'Category' })->{ categorycode };
39
my $branchcode = $builder->build({ source => 'Branch' })->{ branchcode };
40
my $borrower = $builder->build({
41
    source => 'Borrower',
42
    value => {
43
        branchcode   => $branchcode,
44
        categorycode => $categorycode
45
    }
46
});
47
my $borrowernumber = $borrower->{borrowernumber};
48
49
my $biblio = $builder->build( { source => 'Biblio', } );
50
my $biblionumber = $biblio->{biblionumber};
51
52
# Use AddReserve instead of TestBuilder because i don't manage
53
# to make TestBuilder set reserve_group_id to null. Idea ?
54
my $reserve_id = AddReserve($branchcode, $borrowernumber,
55
$biblionumber, $biblionumber, 1, undef, undef, undef
56
$biblio->{title}, undef, undef, undef);
57
58
is(GetReserveCount($borrowernumber), 1, 'Test borrower has 1 reserve.');
59
60
my $reserves_group = $builder->build({
61
    source => 'ReserveGroup',
62
    value => {
63
        reserve_group_id => 1
64
    }
65
});
66
67
my $reserve2 = $builder->build({
68
    source => 'Reserve',
69
    value => {
70
        borrowernumber => $borrowernumber,
71
        reserve_group_id => 1
72
    }
73
});
74
my $reserve3 = $builder->build({
75
    source => 'Reserve',
76
    value => {
77
        borrowernumber => $borrowernumber,
78
        reserve_group_id => 1
79
    }
80
});
81
82
is(GetReserveCount($borrowernumber), 2, 'Test borrower has 2 reserve.');
83
84
my $reserves_group2 = $builder->build({
85
    source => 'ReserveGroup',
86
    value => {
87
        reserve_group_id => 2
88
    }
89
});
90
my $reserve_group_id2 = $reserves_group2->{reserve_group_id};
91
92
my $reserve4 = $builder->build({
93
    source => 'Reserve',
94
    value => {
95
        borrowernumber => $borrowernumber,
96
        reserve_group_id => 2
97
    }
98
});
99
my $reserve5 = $builder->build({
100
    source => 'Reserve',
101
    value => {
102
        borrowernumber => $borrowernumber,
103
        reserve_group_id => 2
104
    }
105
});
106
my $reserve6 = $builder->build({
107
    source => 'Reserve',
108
    value => {
109
        borrowernumber => $borrowernumber,
110
        reserve_group_id => 2
111
    }
112
});
113
114
is(GetReserveCount($borrowernumber), 3, 'Test borrower has 2 reserve.');
115
116
$dbh->rollback;

Return to bug 15516