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

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (+1 lines)
Lines 222-227 Link Here
222
                                                </td>
222
                                                </td>
223
                                                [% IF ( OpacRenewalAllowed && !( borrower.is_expired && borrower.BlockExpiredPatronOpacActions ) ) %]
223
                                                [% IF ( OpacRenewalAllowed && !( borrower.is_expired && borrower.BlockExpiredPatronOpacActions ) ) %]
224
                                                    <td class="renew">
224
                                                    <td class="renew">
225
                                                    [% IF ISSUE.renewed %]<span class="alert">Renewed!</span>[% END %]
225
                                                    [% IF ( ISSUE.status ) %]
226
                                                    [% IF ( ISSUE.status ) %]
226
                                                        [% IF ( canrenew ) %]
227
                                                        [% IF ( canrenew ) %]
227
                                                            <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>
228
                                                            <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>
(-)a/opac/opac-renew.pl (-3 / +8 lines)
Lines 43-53 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here
43
        debug           => 1,
43
        debug           => 1,
44
	}
44
	}
45
); 
45
); 
46
my @items          = $query->param('item');
46
my @items = $query->param('item');
47
47
48
my $opacrenew = C4::Context->preference("OpacRenewalAllowed");
48
my $opacrenew = C4::Context->preference("OpacRenewalAllowed");
49
49
50
my $errorstring='';
50
my $errorstring = q{};
51
my $renewed     = q{};
52
51
my $member_details = GetMemberDetails($borrowernumber);
53
my $member_details = GetMemberDetails($borrowernumber);
52
54
53
if (   $member_details->{'BlockExpiredPatronOpacActions'}
55
if (   $member_details->{'BlockExpiredPatronOpacActions'}
Lines 56-61 if ( $member_details->{'BlockExpiredPatronOpacActions'} Link Here
56
    $errorstring = 'card_expired';
58
    $errorstring = 'card_expired';
57
}
59
}
58
else {
60
else {
61
    my @renewed;
59
    for my $itemnumber (@items) {
62
    for my $itemnumber (@items) {
60
        my ( $status, $error ) =
63
        my ( $status, $error ) =
61
          CanBookBeRenewed( $borrowernumber, $itemnumber );
64
          CanBookBeRenewed( $borrowernumber, $itemnumber );
Lines 81-92 else { Link Here
81
                $branchcode = 'OPACRenew';
84
                $branchcode = 'OPACRenew';
82
            }
85
            }
83
            AddRenewal( $borrowernumber, $itemnumber, $branchcode );
86
            AddRenewal( $borrowernumber, $itemnumber, $branchcode );
87
            push( @renewed, $itemnumber );
84
        }
88
        }
85
        else {
89
        else {
86
            $errorstring .= $error . "|";
90
            $errorstring .= $error . "|";
87
        }
91
        }
88
    }
92
    }
93
    $renewed = join( '|', @renewed );
89
}
94
}
90
95
91
print $query->redirect("/cgi-bin/koha/opac-user.pl?renew_error=$errorstring");
96
print $query->redirect("/cgi-bin/koha/opac-user.pl?renew_error=$errorstring&renewed=$renewed");
92
97
(-)a/opac/opac-user.pl (-1 / +4 lines)
Lines 64-69 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here
64
    }
64
    }
65
);
65
);
66
66
67
my %renewed = map { $_ => 1 } split( '|', $query->param('renewed') );
68
67
my $show_priority;
69
my $show_priority;
68
for ( C4::Context->preference("OPACShowHoldQueueDetails") ) {
70
for ( C4::Context->preference("OPACShowHoldQueueDetails") ) {
69
    m/priority/ and $show_priority = 1;
71
    m/priority/ and $show_priority = 1;
Lines 189-194 if ($issues){ Link Here
189
            $issue->{'status'} = $status;
191
            $issue->{'status'} = $status;
190
        }
192
        }
191
193
194
        $issue->{'renewed'} = $renewed{ $issue->{'itemnumber'} };
195
192
        if ($renewerror) {
196
        if ($renewerror) {
193
            $issue->{'too_many'}   = 1 if $renewerror eq 'too_many';
197
            $issue->{'too_many'}   = 1 if $renewerror eq 'too_many';
194
            $issue->{'on_reserve'} = 1 if $renewerror eq 'on_reserve';
198
            $issue->{'on_reserve'} = 1 if $renewerror eq 'on_reserve';
195
- 

Return to bug 12568