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

(-)a/C4/Members.pm (-7 lines)
Lines 168-174 sub GetMemberDetails { Link Here
168
            SELECT borrowers.*,
168
            SELECT borrowers.*,
169
                   category_type,
169
                   category_type,
170
                   categories.description,
170
                   categories.description,
171
                   categories.BlockExpiredPatronOpacActions,
172
                   reservefee,
171
                   reservefee,
173
                   enrolmentperiod
172
                   enrolmentperiod
174
            FROM borrowers
173
            FROM borrowers
Lines 182-188 sub GetMemberDetails { Link Here
182
            SELECT borrowers.*,
181
            SELECT borrowers.*,
183
                   category_type,
182
                   category_type,
184
                   categories.description,
183
                   categories.description,
185
                   categories.BlockExpiredPatronOpacActions,
186
                   reservefee,
184
                   reservefee,
187
                   enrolmentperiod
185
                   enrolmentperiod
188
            FROM borrowers
186
            FROM borrowers
Lines 212-222 sub GetMemberDetails { Link Here
212
    $borrower->{'flags'}     = $flags;
210
    $borrower->{'flags'}     = $flags;
213
    $borrower->{'authflags'} = $accessflagshash;
211
    $borrower->{'authflags'} = $accessflagshash;
214
212
215
    # Handle setting the true behavior for BlockExpiredPatronOpacActions
216
    $borrower->{'BlockExpiredPatronOpacActions'} =
217
      C4::Context->preference('BlockExpiredPatronOpacActions')
218
      if ( $borrower->{'BlockExpiredPatronOpacActions'} == -1 );
219
220
    $borrower->{'is_expired'} = 0;
213
    $borrower->{'is_expired'} = 0;
221
    $borrower->{'is_expired'} = 1 if
214
    $borrower->{'is_expired'} = 1 if
222
      defined($borrower->{dateexpiry}) &&
215
      defined($borrower->{dateexpiry}) &&
(-)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