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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt (+7 lines)
Lines 41-46 Link Here
41
        <p>Patron has holds. They will be cancelled if the discharge is generated.</p>
41
        <p>Patron has holds. They will be cancelled if the discharge is generated.</p>
42
    [% END %]
42
    [% END %]
43
    <form method="post">
43
    <form method="post">
44
        [% IF pending %]
45
        <p>Patron has pending discharge request.</p>
46
        [% ELSIF is_discharged %]
47
        <p>Patron is discharged.</p>
48
        [% ELSIF can_be_discharged %]
49
        <p><input type="submit" value="Request new discharge" name="request" /></p>
50
        [% END %]
44
        <input type="submit" value="Generate discharge" name="discharge" />
51
        <input type="submit" value="Generate discharge" name="discharge" />
45
        <input type="hidden" value="[% patron.borrowernumber | html %]" name="borrowernumber" />
52
        <input type="hidden" value="[% patron.borrowernumber | html %]" name="borrowernumber" />
46
    </form>
53
    </form>
(-)a/members/discharge.pl (-1 / +21 lines)
Lines 66-73 my $can_be_discharged = Koha::Patron::Discharge::can_be_discharged({ Link Here
66
    borrowernumber => $borrowernumber
66
    borrowernumber => $borrowernumber
67
});
67
});
68
68
69
my $is_discharged = Koha::Patron::Discharge::is_discharged({borrowernumber => $loggedinuser});
70
71
my $pending = Koha::Patron::Discharge::count({
72
    borrowernumber => $borrowernumber,
73
    pending        => 1,
74
});
75
76
$template->param( can_be_discharged => $can_be_discharged );
77
$template->param( is_discharged => $is_discharged );
78
$template->param( pending => $pending );
79
80
if ( ! $pending and $can_be_discharged and $input->param('request') ) {
81
    my $success = Koha::Patron::Discharge::request({
82
        borrowernumber => $borrowernumber,
83
    });
84
    if ( $success ) {
85
        $template->param( pending => 1 );
86
    }
87
}
88
69
# Generating discharge if needed
89
# Generating discharge if needed
70
if ( $input->param('discharge') and $can_be_discharged ) {
90
if ( $input->param('discharge') and $can_be_discharged ) {
91
71
    my $is_discharged = Koha::Patron::Discharge::is_discharged({
92
    my $is_discharged = Koha::Patron::Discharge::is_discharged({
72
        borrowernumber => $borrowernumber,
93
        borrowernumber => $borrowernumber,
73
    });
94
    });
74
- 

Return to bug 26350