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

(-)a/C4/Members.pm (-7 lines)
Lines 167-173 sub GetMemberDetails { Link Here
167
            SELECT borrowers.*,
167
            SELECT borrowers.*,
168
                   category_type,
168
                   category_type,
169
                   categories.description,
169
                   categories.description,
170
                   categories.BlockExpiredPatronOpacActions,
171
                   reservefee,
170
                   reservefee,
172
                   enrolmentperiod
171
                   enrolmentperiod
173
            FROM borrowers
172
            FROM borrowers
Lines 181-187 sub GetMemberDetails { Link Here
181
            SELECT borrowers.*,
180
            SELECT borrowers.*,
182
                   category_type,
181
                   category_type,
183
                   categories.description,
182
                   categories.description,
184
                   categories.BlockExpiredPatronOpacActions,
185
                   reservefee,
183
                   reservefee,
186
                   enrolmentperiod
184
                   enrolmentperiod
187
            FROM borrowers
185
            FROM borrowers
Lines 211-221 sub GetMemberDetails { Link Here
211
    $borrower->{'flags'}     = $flags;
209
    $borrower->{'flags'}     = $flags;
212
    $borrower->{'authflags'} = $accessflagshash;
210
    $borrower->{'authflags'} = $accessflagshash;
213
211
214
    # Handle setting the true behavior for BlockExpiredPatronOpacActions
215
    $borrower->{'BlockExpiredPatronOpacActions'} =
216
      C4::Context->preference('BlockExpiredPatronOpacActions')
217
      if ( $borrower->{'BlockExpiredPatronOpacActions'} == -1 );
218
219
    $borrower->{'is_expired'} = 0;
212
    $borrower->{'is_expired'} = 0;
220
    $borrower->{'is_expired'} = 1 if
213
    $borrower->{'is_expired'} = 1 if
221
      defined($borrower->{dateexpiry}) &&
214
      defined($borrower->{dateexpiry}) &&
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-5 / +5 lines)
Lines 156-162 Using this account is not recommended because some parts of Koha will not functi Link Here
156
                                                    <th>Barcode</th>
156
                                                    <th>Barcode</th>
157
                                                [% END %]
157
                                                [% END %]
158
                                                    <th>Call no.</th>
158
                                                    <th>Call no.</th>
159
                                                [% IF ( OpacRenewalAllowed && !( borrower.is_expired && borrower.BlockExpiredPatronOpacActions ) ) %]
159
                                                [% IF ( OpacRenewalAllowed && !( borrower.is_expired && borrower.category.effective_BlockExpiredPatronOpacActions ) ) %]
160
                                                    <th class="nosort">Renew</th>
160
                                                    <th class="nosort">Renew</th>
161
                                                [% END %]
161
                                                [% END %]
162
                                                [% IF ( OPACFinesTab ) %]
162
                                                [% IF ( OPACFinesTab ) %]
Lines 245-251 Using this account is not recommended because some parts of Koha will not functi Link Here
245
                                                    <span class="tdlabel">Call no.:</span>
245
                                                    <span class="tdlabel">Call no.:</span>
246
                                                    [% ISSUE.itemcallnumber %]
246
                                                    [% ISSUE.itemcallnumber %]
247
                                                </td>
247
                                                </td>
248
                                                [% IF ( OpacRenewalAllowed && !( borrower.is_expired && borrower.BlockExpiredPatronOpacActions ) ) %]
248
                                                [% IF ( OpacRenewalAllowed && !( borrower.is_expired && borrower.category.effective_BlockExpiredPatronOpacActions ) ) %]
249
                                                    <td class="renew">
249
                                                    <td class="renew">
250
                                                    [% IF ISSUE.renewed %]<span class="blabel label-success">Renewed!</span><br />[% END %]
250
                                                    [% IF ISSUE.renewed %]<span class="blabel label-success">Renewed!</span><br />[% END %]
251
                                                    [% IF ( ISSUE.status ) %]
251
                                                    [% IF ( ISSUE.status ) %]
Lines 287-298 Using this account is not recommended because some parts of Koha will not functi Link Here
287
                                        [% END # /FOREACH ISSUES %]
287
                                        [% END # /FOREACH ISSUES %]
288
                                    </tbody>
288
                                    </tbody>
289
                                </table>
289
                                </table>
290
                                [% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( borrower.is_expired && borrower.BlockExpiredPatronOpacActions ) ) %]
290
                                [% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( borrower.is_expired && borrower.category.effective_BlockExpiredPatronOpacActions ) ) %]
291
                                    <input type="submit" class="btn" value="Renew selected" />
291
                                    <input type="submit" class="btn" value="Renew selected" />
292
                                [% END %]
292
                                [% END %]
293
                                </form>
293
                                </form>
294
294
295
                                [% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( borrower.is_expired && borrower.BlockExpiredPatronOpacActions ) ) %]
295
                                [% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( borrower.is_expired && borrower.category.effective_BlockExpiredPatronOpacActions ) ) %]
296
                                <form id="renewall" action="/cgi-bin/koha/opac-renew.pl" method="post">
296
                                <form id="renewall" action="/cgi-bin/koha/opac-renew.pl" method="post">
297
                                    <input type="hidden" name="from" value="opac_user" />
297
                                    <input type="hidden" name="from" value="opac_user" />
298
                                    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
298
                                    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
Lines 878-884 Using this account is not recommended because some parts of Koha will not functi Link Here
878
                    e.preventDefault();
878
                    e.preventDefault();
879
                    $("#renewall").submit();
879
                    $("#renewall").submit();
880
                });
880
                });
881
                [% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( borrower.is_expired && borrower.BlockExpiredPatronOpacActions ) ) %]
881
                [% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( borrower.is_expired && borrower.category.effective_BlockExpiredPatronOpacActions ) ) %]
882
                    $("#checkoutst caption").append("<div id=\"renewcontrols\"><a id=\"renewselected_link\" href=\"#\">"+_("Renew selected")+"</a> <a id=\"renewall_link\" href=\"#\">"+_("Renew all")+"</a></div>");
882
                    $("#checkoutst caption").append("<div id=\"renewcontrols\"><a id=\"renewselected_link\" href=\"#\">"+_("Renew selected")+"</a> <a id=\"renewall_link\" href=\"#\">"+_("Renew all")+"</a></div>");
883
                [% END %]
883
                [% END %]
884
            [% END %]
884
            [% END %]
(-)a/opac/opac-renew.pl (-1 / +3 lines)
Lines 30-35 use C4::Auth; Link Here
30
use C4::Context;
30
use C4::Context;
31
use C4::Items;
31
use C4::Items;
32
use C4::Members;
32
use C4::Members;
33
use Koha::Patrons;
33
use Date::Calc qw( Today Date_to_Days );
34
use Date::Calc qw( Today Date_to_Days );
34
my $query = new CGI;
35
my $query = new CGI;
35
36
Lines 49-57 my $opacrenew = C4::Context->preference("OpacRenewalAllowed"); Link Here
49
my $errorstring = q{};
50
my $errorstring = q{};
50
my $renewed     = q{};
51
my $renewed     = q{};
51
52
53
my $patron = Koha::Patrons->find( $borrowernumber );
52
my $member_details = GetMemberDetails($borrowernumber);
54
my $member_details = GetMemberDetails($borrowernumber);
53
55
54
if (   $member_details->{'BlockExpiredPatronOpacActions'}
56
if (   $patron->category->effective_BlockExpiredPatronOpacActions
55
    && $member_details->{'is_expired'} )
57
    && $member_details->{'is_expired'} )
56
{
58
{
57
    $errorstring = 'card_expired';
59
    $errorstring = 'card_expired';
(-)a/opac/opac-reserve.pl (-2 / +2 lines)
Lines 71-79 sub get_out { Link Here
71
71
72
# get borrower information ....
72
# get borrower information ....
73
my ( $borr ) = GetMemberDetails( $borrowernumber );
73
my ( $borr ) = GetMemberDetails( $borrowernumber );
74
my $patron = Koha::Patrons->find( $borrowernumber );
74
75
75
# check if this user can place a reserve, -1 means use sys pref, 0 means dont block, 1 means block
76
# check if this user can place a reserve, -1 means use sys pref, 0 means dont block, 1 means block
76
if ( $borr->{'BlockExpiredPatronOpacActions'} ) {
77
if ( $patron->category->effective_BlockExpiredPatronOpacActions ) {
77
78
78
    if ( $borr->{'is_expired'} ) {
79
    if ( $borr->{'is_expired'} ) {
79
80
80
- 

Return to bug 17578