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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt (-3 / +17 lines)
Lines 207-215 Link Here
207
    </li>
207
    </li>
208
    <li><label for="block_expired">Block expired patrons</label>
208
    <li><label for="block_expired">Block expired patrons</label>
209
        <select name="block_expired" id="block_expired">
209
        <select name="block_expired" id="block_expired">
210
            <option value="-1" [% IF ( BlockExpiredPatronOpacActions == -1  ) %] selected="selected" [% END %]> Follow system preference BlockExpiredPatronOpacActions </option>
210
            [% IF ( BlockExpiredPatronOpacActions == -1  ) %]
211
            <option value="1"  [% IF ( BlockExpiredPatronOpacActions == 1   ) %] selected="selected" [% END %]> Block </option>
211
                <option value="-1" selected="selected"> Follow system preference BlockExpiredPatronOpacActions </option>
212
            <option value="0"  [% IF ( BlockExpiredPatronOpacActions == 0   ) %] selected="selected" [% END %]> Don't block </option>
212
            [% ELSE %]
213
                <option value="-1"> Follow system preference BlockExpiredPatronOpacActions </option>
214
            [% END %]
215
216
            [% IF ( BlockExpiredPatronOpacActions == 1   ) %]
217
                <option value="1" selected="selected"> Block </option>
218
            [% ELSE %]
219
                <option value="1"> Block </option>
220
            [% END %]
221
222
            [% IF ( BlockExpiredPatronOpacActions == 0   ) %]
223
                <option value="0" selected="selected"> Don't block </option>
224
            [% ELSE %]
225
                <option value="0"> Don't block </option>
226
            [% END %]
213
        </select>
227
        </select>
214
        Should patrons of this category be blocked from opac actions such as renew and reserve when their cards have expired.
228
        Should patrons of this category be blocked from opac actions such as renew and reserve when their cards have expired.
215
    </li>
229
    </li>
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt (-3 / +15 lines)
Lines 94-110 $.tablesorter.addParser({ Link Here
94
94
95
        [% IF ( BORROWER_INF.warnexpired ) %]
95
        [% IF ( BORROWER_INF.warnexpired ) %]
96
        <div class="dialog alert" id="warnexpired">
96
        <div class="dialog alert" id="warnexpired">
97
            <strong>Please note:</strong><span> Your card has expired. Please contact the library for more information.</span>
97
            <strong>Please note:</strong><span> Your account has expired. Please contact the library for more information.</span>
98
        </div>
98
        </div>
99
        [% ELSIF ( BORROWER_INF.warnexpired ) %]
99
        [% ELSIF ( BORROWER_INF.warnexpired ) %]
100
        <div class="dialog alert">
100
        <div class="dialog alert">
101
                <string>Please note:</string><span> You card has expired as of [% BORROWER_INF.warnexpired %]. Please contact the library if you wish to renew your subscription.</span>
101
                <strong>Please note:</strong><span> You account has expired as of [% BORROWER_INF.warnexpired %]. Please contact the library if you wish to renew your account.</span>
102
        </div>
102
        </div>
103
        [% END %]
103
        [% END %]
104
104
105
        [% IF ( RENEW_ERROR ) %]
105
        [% IF ( RENEW_ERROR ) %]
106
        <div class="dialog alert">
106
        <div class="dialog alert">
107
                <string>Please note:</string><span> You're renew failed with the following error: [% RENEW_ERROR %]</span>
107
                <string>Please note:</string>
108
                <span>
109
                    Your account renewal failed because of the following:
110
                    [% FOREACH error IN RENEW_ERROR.split('|') %]
111
                        [% IF error == 'card_expired' %]
112
                            Your account has expired. Please contact the library for more information.
113
                        [% ELSIF error == 'too_many' %]
114
                            You have renewed this item the maximum number of times allowed.
115
                        [% ELSIF error == 'on_reserve' %]
116
                            This item is on hold for another patron.
117
                        [% END %]
118
                    [% END %]
119
                </span>
108
        </div>
120
        </div>
109
        [% END %]
121
        [% END %]
110
122
(-)a/opac/opac-renew.pl (-1 / +1 lines)
Lines 51-57 my $member_details = GetMemberDetails($borrowernumber); Link Here
51
# BlockExpiredPatronOpacActions syspref 0 is false, 1 is true. BlockExpiredPatronOpacActions for categories (from GetMemberDetails) -1 means use syspref, 0 is false, 1 is true (where false means dont block, true means block)
51
# BlockExpiredPatronOpacActions syspref 0 is false, 1 is true. BlockExpiredPatronOpacActions for categories (from GetMemberDetails) -1 means use syspref, 0 is false, 1 is true (where false means dont block, true means block)
52
if( ($member_details->{'BlockExpiredPatronOpacActions'} == -1 ? C4::Conext->preference('BlockExpiredPatronOpacActions') : $member_details->{'BlockExpiredPatronOpacActions'})
52
if( ($member_details->{'BlockExpiredPatronOpacActions'} == -1 ? C4::Conext->preference('BlockExpiredPatronOpacActions') : $member_details->{'BlockExpiredPatronOpacActions'})
53
    && Date_to_Days( Today() ) > Date_to_Days( split /-/, $member_details->{'dateexpiry'} ) ){
53
    && Date_to_Days( Today() ) > Date_to_Days( split /-/, $member_details->{'dateexpiry'} ) ){
54
   $errorstring='unable to renew as your card has expired';
54
   $errorstring = 'card_expired';
55
} else {
55
} else {
56
    for my $itemnumber ( @items ) {
56
    for my $itemnumber ( @items ) {
57
        my ($status,$error) = CanBookBeRenewed( $borrowernumber, $itemnumber );
57
        my ($status,$error) = CanBookBeRenewed( $borrowernumber, $itemnumber );
(-)a/opac/opac-user.pl (-5 / +1 lines)
Lines 137-152 if ( $borr->{'dateexpiry'} && C4::Context->preference('NotifyBorrowerDeparture') Link Here
137
    }
137
    }
138
}
138
}
139
139
140
# pass on any renew errors to the template for displaying
141
$template->param( RENEW_ERROR => $query->param('renew_error') ) if $query->param('renew_error');
142
143
$template->param(   BORROWER_INFO     => \@bordat,
140
$template->param(   BORROWER_INFO     => \@bordat,
144
                    borrowernumber    => $borrowernumber,
141
                    borrowernumber    => $borrowernumber,
145
                    patron_flagged    => $borr->{flagged},
142
                    patron_flagged    => $borr->{flagged},
146
                    OPACMySummaryHTML => (C4::Context->preference("OPACMySummaryHTML")) ? 1 : 0,
143
                    OPACMySummaryHTML => (C4::Context->preference("OPACMySummaryHTML")) ? 1 : 0,
147
                    surname           => $borr->{surname},
144
                    surname           => $borr->{surname},
148
                    showname          => $borr->{showname},
145
                    showname          => $borr->{showname},
149
146
                    RENEW_ERROR       => $query->param('renew_error'),
150
                );
147
                );
151
148
152
#get issued items ....
149
#get issued items ....
153
- 

Return to bug 6739