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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc (-1 / +7 lines)
Lines 51-57 Link Here
51
                                    Discharge
51
                                    Discharge
52
                            [% END %]
52
                            [% END %]
53
                        </td>
53
                        </td>
54
                        <td>[% d.comment %]</td>
54
                        <td>
55
			    [% IF d.comment.search('OVERDUES_PROCESS') %]
56
				Restriction added by overdues process [% d.comment.remove('OVERDUES_PROCESS ') %]
57
			    [% ELSE %]
58
				[% d.comment %]
59
			    [% END %]
60
			</td>
55
                        <td>[% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] <i>Indefinite</i> [% END %]</td>
61
                        <td>[% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] <i>Indefinite</i> [% END %]</td>
56
                        [% IF CAN_user_borrowers && CAN_user_circulate_manage_restrictions %]
62
                        [% IF CAN_user_borrowers && CAN_user_circulate_manage_restrictions %]
57
                            <td>
63
                            <td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-1 / +6 lines)
Lines 781-787 No patron matched <span class="ex">[% message %]</span> Link Here
781
                   [% END %]
781
                   [% END %]
782
782
783
                   [% IF ( debarredcomment ) %]
783
                   [% IF ( debarredcomment ) %]
784
                       with the explanation: <br/><i>[% debarredcomment | html_line_break %]</i>
784
                       with the explanation: <br/><i>
785
			   [% IF debarredcomment.search('OVERDUES_PROCESS') %]
786
	                       Restriction added by overdues process [% debarredcomment.remove('OVERDUES_PROCESS ') | html_line_break %]
787
	                   [% ELSE %]
788
	                       [% debarredcomment | html_line_break %]
789
	                   [% END %]
785
                   [% END %]
790
                   [% END %]
786
791
787
                   <br/>
792
                   <br/>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-1 / +7 lines)
Lines 863-869 $(document).ready(function() { Link Here
863
                            [% FOREACH d IN debarments %]
863
                            [% FOREACH d IN debarments %]
864
                                <tr>
864
                                <tr>
865
                                    <td>[% d.type %]</td>
865
                                    <td>[% d.type %]</td>
866
                                    <td>[% d.comment %]</td>
866
                                    <td>
867
                                    [% IF d.comment.search('OVERDUES_PROCESS') %]
868
                                        Restriction added by overdues process [% d.comment.remove('OVERDUES_PROCESS ') %]
869
                                    [% ELSE %]
870
                                        [% d.comment %]
871
                                    [% END %]
872
                                    </td>
867
                                    <td>[% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] <i>Indefinite</i> [% END %]</td>
873
                                    <td>[% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] <i>Indefinite</i> [% END %]</td>
868
                                    [% IF CAN_user_borrowers && CAN_user_circulate_manage_restrictions %]
874
                                    [% IF CAN_user_borrowers && CAN_user_circulate_manage_restrictions %]
869
                                      <td>
875
                                      <td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-1 / +6 lines)
Lines 187-193 function validate1(date) { Link Here
187
               [% END %]
187
               [% END %]
188
188
189
               [% IF ( debarredcomment ) %]
189
               [% IF ( debarredcomment ) %]
190
                   with the explanation: <i>[% debarredcomment | html_line_break %]</i>
190
                   with the explanation: <i>
191
                   [% IF debarredcomment.search('OVERDUES_PROCESS') %]
192
                       Restriction added by overdues process [% debarredcomment.remove('OVERDUES_PROCESS ') | html_line_break %]
193
                   [% ELSE %]
194
                       [% debarredcomment | html_line_break %]
195
                   [% END %]
191
               [% END %]
196
               [% END %]
192
                <a href="#reldebarments" onclick="$('#debarments-tab-link').click()">View restrictions</a>
197
                <a href="#reldebarments" onclick="$('#debarments-tab-link').click()">View restrictions</a>
193
            </li>
198
            </li>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt (-1 / +9 lines)
Lines 41-47 Link Here
41
                        [% IF ( debarred ) %]
41
                        [% IF ( debarred ) %]
42
                            <li id="debarred">
42
                            <li id="debarred">
43
                                Your account has been frozen.
43
                                Your account has been frozen.
44
                                [% IF debarred_comment %] Comment: <span id="userdebarred_comment">"[% debarred_comment %]"</span>[% END %]
44
                                [% IF debarred_comment %] Comment: <span id="userdebarred_comment">"
45
				    [% IF debarred_comment.search('OVERDUES_PROCESS') %]
46
                                         Restriction added by overdues process [% debarred_comment.remove('OVERDUES_PROCESS ') | html_line_break %]
47
                                    [% ELSE %]
48
                                         [% debarred_comment | html_line_break %]
49
                                [% END %]
50
			        </span>
51
			[% END %]
52
45
                                [% IF debarred_date && debarred_date != '9999-12-31' %] End date: <span id="userdebarred_date">[% debarred_date | $KohaDates %]</span>[% END %]
53
                                [% IF debarred_date && debarred_date != '9999-12-31' %] End date: <span id="userdebarred_date">[% debarred_date | $KohaDates %]</span>[% END %]
46
                                <br /><em>Usually the reason for freezing an account is old overdues or damage fees. If shows your account to be clear, please contact the library.</em> <a href="/cgi-bin/koha/opac-account.pl">Go to your account page</a>
54
                                <br /><em>Usually the reason for freezing an account is old overdues or damage fees. If shows your account to be clear, please contact the library.</em> <a href="/cgi-bin/koha/opac-account.pl">Go to your account page</a>
47
                            </li>
55
                            </li>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-1 / +10 lines)
Lines 91-97 Link Here
91
                        <div class="alert">
91
                        <div class="alert">
92
                            <ul>
92
                            <ul>
93
                                [% IF ( userdebarred ) %]
93
                                [% IF ( userdebarred ) %]
94
                                    <li id="userdebarred"><strong>Please note:</strong> Your account has been frozen[% IF ( BORROWER_INFO.userdebarreddate ) %] until <span id="userdebarred_date">[% BORROWER_INFO.userdebarreddate | $KohaDates %]</span>[% END %][% IF ( BORROWER_INFO.debarredcomment ) %] with the comment <span id="userdebarred_comment">"[% BORROWER_INFO.debarredcomment %]"</span>[% END %]. Usually the reason for freezing an account is old overdues or damage fees. If <a href="/cgi-bin/koha/opac-account.pl">your account page</a> shows your account to be clear, please contact the library.</li>
94
                                    <li id="userdebarred"><strong>Please note:</strong> Your account has been frozen[% IF ( BORROWER_INFO.userdebarreddate ) %] until <span id="userdebarred_date">[% BORROWER_INFO.userdebarreddate | $KohaDates %]</span>[% END %]
95
                                    [% IF ( BORROWER_INFO.debarredcomment ) %] with the comment
96
                                    <span id="userdebarred_comment">
97
                                        [% IF BORROWER_INFO.debarredcomment.search('OVERDUES_PROCESS') %]
98
                                            "Restriction added by overdues process [% BORROWER_INFO.debarredcomment.remove('OVERDUES_PROCESS ') %]"
99
                                        [% ELSE %]
100
                                            [% BORROWER_INFO.debarredcomment %]
101
                                        [% END %]
102
                                    </span>
103
                                    [% END %]. Usually the reason for freezing an account is old overdues or damage fees. If <a href="/cgi-bin/koha/opac-account.pl">your account page</a> shows your account to be clear, please contact the library.</li>
95
                                [% END %]
104
                                [% END %]
96
                                [% IF ( BORROWER_INFO.gonenoaddress ) %]
105
                                [% IF ( BORROWER_INFO.gonenoaddress ) %]
97
                                    <li id="gonenoaddress"><strong>Please note:</strong> According to our records, we don't have up-to-date [% UNLESS OPACPatronDetails %]<a href="/cgi-bin/koha/opac-memberentry.pl">contact information</a>[% ELSE %]contact information[% END %] on file.  Please contact the library[% IF OPACPatronDetails %] or use the <a href="/cgi-bin/koha/opac-memberentry.pl">online update form</a> to submit current information (<em>Please note:</em> there may be a delay in restoring your account if you submit online)[% END %].</li>
106
                                    <li id="gonenoaddress"><strong>Please note:</strong> According to our records, we don't have up-to-date [% UNLESS OPACPatronDetails %]<a href="/cgi-bin/koha/opac-memberentry.pl">contact information</a>[% ELSE %]contact information[% END %] on file.  Please contact the library[% IF OPACPatronDetails %] or use the <a href="/cgi-bin/koha/opac-memberentry.pl">online update form</a> to submit current information (<em>Please note:</em> there may be a delay in restoring your account if you submit online)[% END %].</li>
(-)a/misc/cronjobs/overdue_notices.pl (-3 / +1 lines)
Lines 598-605 END_SQL Link Here
598
                        {
598
                        {
599
                            borrowernumber => $borrowernumber,
599
                            borrowernumber => $borrowernumber,
600
                            type           => 'OVERDUES',
600
                            type           => 'OVERDUES',
601
                            comment => "Restriction added by overdues process "
601
                            comment => "OVERDUES_PROCESS " .  output_pref( dt_from_string() ),
602
                              . output_pref( dt_from_string() ),
603
                        }
602
                        }
604
                    );
603
                    );
605
                    $verbose and warn "debarring $borr\n";
604
                    $verbose and warn "debarring $borr\n";
606
- 

Return to bug 12509