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

(-)a/Koha/Patron/Discharge.pm (-3 / +5 lines)
Lines 13-20 use Koha::Database; Link Here
13
use Koha::DateUtils qw( dt_from_string output_pref );
13
use Koha::DateUtils qw( dt_from_string output_pref );
14
use Koha::Patrons;
14
use Koha::Patrons;
15
15
16
my $rs = Koha::Database->new->schema->resultset('Discharge');
17
18
sub count {
16
sub count {
19
    my ($params) = @_;
17
    my ($params) = @_;
20
    my $values = {};
18
    my $values = {};
Lines 30-35 sub count { Link Here
30
        $values->{validated} = { '!=', undef };
28
        $values->{validated} = { '!=', undef };
31
    }
29
    }
32
30
31
    my $rs = Koha::Database->new->schema->resultset('Discharge');
33
    return $rs->search( $values )->count;
32
    return $rs->search( $values )->count;
34
}
33
}
35
34
Lines 67-72 sub request { Link Here
67
    return unless $borrowernumber;
66
    return unless $borrowernumber;
68
    return unless can_be_discharged({ borrowernumber => $borrowernumber });
67
    return unless can_be_discharged({ borrowernumber => $borrowernumber });
69
68
69
    my $rs = Koha::Database->new->schema->resultset('Discharge');
70
    return $rs->create({
70
    return $rs->create({
71
        borrower => $borrowernumber,
71
        borrower => $borrowernumber,
72
        needed   => dt_from_string,
72
        needed   => dt_from_string,
Lines 92-97 sub discharge { Link Here
92
    });
92
    });
93
93
94
    # Generate the discharge
94
    # Generate the discharge
95
    my $rs = Koha::Database->new->schema->resultset('Discharge');
95
    my $discharge = $rs->search({ borrower => $borrowernumber }, { order_by => { -desc => 'needed' }, rows => 1 });
96
    my $discharge = $rs->search({ borrower => $borrowernumber }, { order_by => { -desc => 'needed' }, rows => 1 });
96
    if( $discharge->count > 0 ) {
97
    if( $discharge->count > 0 ) {
97
        $discharge->update({ validated => dt_from_string });
98
        $discharge->update({ validated => dt_from_string });
Lines 163-168 sub get_pendings { Link Here
163
        ( defined $branchcode ? ( 'borrower.branchcode' => $branchcode ) : () ),
164
        ( defined $branchcode ? ( 'borrower.branchcode' => $branchcode ) : () ),
164
    };
165
    };
165
166
167
    my $rs = Koha::Database->new->schema->resultset('Discharge');
166
    my @rs = $rs->search( $cond, { join => 'borrower' } );
168
    my @rs = $rs->search( $cond, { join => 'borrower' } );
167
    return \@rs;
169
    return \@rs;
168
}
170
}
Lines 178-183 sub get_validated { Link Here
178
        ( defined $branchcode ? ( 'borrower.branchcode' => $branchcode ) : () ),
180
        ( defined $branchcode ? ( 'borrower.branchcode' => $branchcode ) : () ),
179
    };
181
    };
180
182
183
    my $rs = Koha::Database->new->schema->resultset('Discharge');
181
    my @rs = $rs->search( $cond, { join => 'borrower' } );
184
    my @rs = $rs->search( $cond, { join => 'borrower' } );
182
    return \@rs;
185
    return \@rs;
183
}
186
}
184
- 

Return to bug 18851