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

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-14 / +12 lines)
Lines 200-220 Link Here
200
                                                </td>
200
                                                </td>
201
                                                [% IF ( OpacRenewalAllowed ) %]
201
                                                [% IF ( OpacRenewalAllowed ) %]
202
                                                    <td class="renew">
202
                                                    <td class="renew">
203
                                                        [% IF ( ISSUE.status ) %]
203
                                                    [% IF ( ISSUE.status ) %]
204
                                                            [% IF ( canrenew ) %]
204
                                                        [% IF ( canrenew ) %]
205
                                                                <input type="checkbox" name="item" value="[% ISSUE.itemnumber %]"/> <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=[% ISSUE.itemnumber %]&amp;borrowernumber=[% ISSUE.borrowernumber %]">Renew</a>
205
                                                            <input type="checkbox" name="item" value="[% ISSUE.itemnumber %]"/> <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=[% ISSUE.itemnumber %]&amp;borrowernumber=[% ISSUE.borrowernumber %]">Renew</a>
206
                                                            [% END %]
207
                                                            <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span>
208
                                                        [% ELSE %]
209
                                                            Not renewable
210
                                                                [% IF ( ISSUE.too_many ) %]
211
                                                                    <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span>
212
                                                                [% ELSE %]
213
                                                                    [% IF ( ISSUE.on_reserve ) %]
214
                                                                        <span class="renewals">(On hold)</span>
215
                                                                    [% END %]
216
                                                                [% END %]
217
                                                        [% END %]
206
                                                        [% END %]
207
                                                        <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span>
208
                                                    [% ELSIF ( ISSUE.too_many ) %]
209
                                                        Not renewable
210
                                                    [% ELSIF ( ISSUE.too_soon ) %]
211
                                                        No renewal before [% ISSUE.soonestrenewdate %]
212
                                                        <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span>
213
                                                    [% ELSIF ( ISSUE.on_reserve ) %]
214
                                                        <span class="renewals">(On hold)</span>
215
                                                    [% END %]
218
                                                    </td>
216
                                                    </td>
219
                                                [% END %]
217
                                                [% END %]
220
                                                [% IF ( OPACFinesTab ) %]
218
                                                [% IF ( OPACFinesTab ) %]
(-)a/opac/opac-user.pl (-3 / +15 lines)
Lines 182-189 if ($issues){ Link Here
182
        if($status && C4::Context->preference("OpacRenewalAllowed")){
182
        if($status && C4::Context->preference("OpacRenewalAllowed")){
183
            $issue->{'status'} = $status;
183
            $issue->{'status'} = $status;
184
        }
184
        }
185
        $issue->{'too_many'} = 1 if $renewerror and $renewerror eq 'too_many';
185
186
        $issue->{'on_reserve'} = 1 if $renewerror and $renewerror eq 'on_reserve';
186
        if ($renewerror) {
187
            $issue->{'too_many'}   = 1 if $renewerror eq 'too_many';
188
            $issue->{'on_reserve'} = 1 if $renewerror eq 'on_reserve';
189
190
            if ( $renewerror eq 'too_soon' ) {
191
                $issue->{'too_soon'}         = 1;
192
                $issue->{'soonestrenewdate'} = output_pref(
193
                    C4::Circulation::GetSoonestRenewDate(
194
                        $issue->{borrowernumber},
195
                        $issue->{itemnumber}
196
                    )
197
                );
198
            }
199
        }
187
200
188
        if ( $issue->{'overdue'} ) {
201
        if ( $issue->{'overdue'} ) {
189
            push @overdues, $issue;
202
            push @overdues, $issue;
190
- 

Return to bug 7413