Attachment #140719 for bug #31095

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




[% PROCESS 'member-main-address-style.inc' %]
[% PROCESS 'member-alt-address-style.inc' %]
[% PROCESS 'member-alt-contact-style.inc' %]
[% PROCESS 'restriction-types.inc' %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
    <title>


                                    <fieldset class="rows" id="memberentry_restrictions">
                                        <legend id="restrictions_lgd">Patron restrictions</legend>
                                        [% IF ( patron.restrictions.count ) %]
                                            <table>
                                                <thead>
                                                    <tr>

                                                    </tr>
                                                </thead>
                                                <tbody>
                                                    [% FOREACH restriction IN patron.restrictions %]
                                                        [% dtype = d.type %]
                                                        <tr>
                                                            <td>[% PROCESS restriction_type_description restriction_type=restriction.type %]</td>
                                                            <td>
                                                                [% IF restriction.comment.search('OVERDUES_PROCESS') %]
                                                                    Restriction added by overdues process [% restriction.comment.remove('OVERDUES_PROCESS ') | $raw %]
                                                                [% ELSE %]
                                                                    [% restriction.comment | $raw %]
                                                                [% END %]
                                                            </td>
                                                            <td>
                                                                [% IF restriction.expiration %]
                                                                    [% restriction.expiration | $KohaDates %]
                                                                [% ELSE %]
                                                                    <em>Indefinite</em>
                                                                [% END %]
                                                            </td>
                                                            <td>[% restriction.created | $KohaDates %]</td>
                                                            [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
                                                                <td>
                                                                    <input type="checkbox" id="debarment_[% restriction.borrower_debarment_id | html %]" name="remove_debarment" value="[% restriction.borrower_debarment_id | html %]" />
                                                                </td>
                                                            [% END %]
                                                        </tr>

                                            </table>
                                        [% ELSE %]
                                            <p>Patron is currently unrestricted.</p>
                                        [% END # /IF ( patron.restrictions.count ) %]

                                        [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
                                        <p><a href="#" id="add_manual_restriction"><i class="fa fa-plus"></i> Add manual restriction</a></p>
                                            <fieldset id="manual_restriction_form">
                                                <input type="hidden" id="add_debarment" name="add_debarment" value="0" />
                                                <legend id="manual_restriction_lgd">Add manual restriction</legend>

                                                    <li>
                                                        <label for="debarred_type">Type:</label>
                                                        <select name="debarred_type">
                                                            [% FOREACH restriction_type IN restriction_types %]
                                                                [% IF !restriction_type.is_system %]
                                                                    [% IF restriction_type.is_default %]
                                                                    <option value="[% code | html %]" selected>[% PROCESS restriction_type_description %]</option>
                                                                    [% ELSE %]
                                                                    <option value="[% code | html %]">[% PROCESS restriction_type_description %]</option>
                                                                    [% END %]
                                                                [% END %]
                                                            [% END %]




use Koha::AuthUtils;
use Koha::AuthorisedValues;
use Koha::Email;
use Koha::Patron::Debarments qw( AddDebarment DelDebarment );
use Koha::Patron::Restriction::Types;
use Koha::Cities;
use Koha::DateUtils qw( dt_from_string );


## Deal with debarments
$template->param(
    restriction_types => scalar Koha::Patron::Restriction::Types->search()
    restriction_types => scalar Koha::Patron::Restriction::Types->keyed_on_code()
);
my @debarments_to_remove = $input->multi_param('remove_debarment');
foreach my $d ( @debarments_to_remove ) {
- 

Return to bug 31095

Lines 8-14 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-19 / +18 lines)
8	[% PROCESS 'member-main-address-style.inc' %]	8	[% PROCESS 'member-main-address-style.inc' %]
9	[% PROCESS 'member-alt-address-style.inc' %]	9	[% PROCESS 'member-alt-address-style.inc' %]
10	[% PROCESS 'member-alt-contact-style.inc' %]	10	[% PROCESS 'member-alt-contact-style.inc' %]
11	[% PROCESS 'patron_restrictions.inc' %]	11	[% PROCESS 'restriction-types.inc' %]
12	[% SET footerjs = 1 %]	12	[% SET footerjs = 1 %]
13	[% INCLUDE 'doc-head-open.inc' %]	13	[% INCLUDE 'doc-head-open.inc' %]
14	<title>	14	<title>
Lines 1346-1352 legend:hover { Link Here
1346		1346
1347	<fieldset class="rows" id="memberentry_restrictions">	1347	<fieldset class="rows" id="memberentry_restrictions">
1348	<legend id="restrictions_lgd">Patron restrictions</legend>	1348	<legend id="restrictions_lgd">Patron restrictions</legend>
1349	[% IF ( debarments ) %]	1349	[% IF ( patron.restrictions.count ) %]
1350	<table>	1350	<table>
1351	<thead>	1351	<thead>
1352	<tr>	1352	<tr>
Lines 1360-1387 legend:hover { Link Here
1360	</tr>	1360	</tr>
1361	</thead>	1361	</thead>
1362	<tbody>	1362	<tbody>
1363	[% FOREACH d IN debarments %]	1363	[% FOREACH restriction IN patron.restrictions %]
1364	[% dtype = d.type %]
1365	<tr>	1364	<tr>
1366	<td>[% restriction_types.$dtype.display_text \| html %]</td>	1365	<td>[% PROCESS restriction_type_description restriction_type=restriction.type %]</td>
1367	<td>	1366	<td>
1368	[% IF d.comment.search('OVERDUES_PROCESS') %]	1367	[% IF restriction.comment.search('OVERDUES_PROCESS') %]
1369	Restriction added by overdues process [% d.comment.remove('OVERDUES_PROCESS ') \| $raw %]	1368	Restriction added by overdues process [% restriction.comment.remove('OVERDUES_PROCESS ') \| $raw %]
1370	[% ELSE %]	1369	[% ELSE %]
1371	[% d.comment \| $raw %]	1370	[% restriction.comment \| $raw %]
1372	[% END %]	1371	[% END %]
1373	</td>	1372	</td>
1374	<td>	1373	<td>
1375	[% IF d.expiration %]	1374	[% IF restriction.expiration %]
1376	[% d.expiration \| $KohaDates %]	1375	[% restriction.expiration \| $KohaDates %]
1377	[% ELSE %]	1376	[% ELSE %]
1378	<em>Indefinite</em>	1377	<em>Indefinite</em>
1379	[% END %]	1378	[% END %]
1380	</td>	1379	</td>
1381	<td>[% d.created \| $KohaDates %]</td>	1380	<td>[% restriction.created \| $KohaDates %]</td>
1382	[% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]	1381	[% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
1383	<td>	1382	<td>
1384	<input type="checkbox" id="debarment_[% d.borrower_debarment_id \| html %]" name="remove_debarment" value="[% d.borrower_debarment_id \| html %]" />	1383	<input type="checkbox" id="debarment_[% restriction.borrower_debarment_id \| html %]" name="remove_debarment" value="[% restriction.borrower_debarment_id \| html %]" />
1385	</td>	1384	</td>
1386	[% END %]	1385	[% END %]
1387	</tr>	1386	</tr>
Lines 1390-1399 legend:hover { Link Here
1390	</table>	1389	</table>
1391	[% ELSE %]	1390	[% ELSE %]
1392	<p>Patron is currently unrestricted.</p>	1391	<p>Patron is currently unrestricted.</p>
1393	[% END # /IF ( debarments ) %]	1392	[% END # /IF ( patron.restrictions.count ) %]
1394		1393
1395	[% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]	1394	[% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
1396	<p><a href="#" id="add_manual_restriction">Add manual restriction</a></p>	1395	<p><a href="#" id="add_manual_restriction"><i class="fa fa-plus"></i> Add manual restriction</a></p>
1397	<fieldset id="manual_restriction_form">	1396	<fieldset id="manual_restriction_form">
1398	<input type="hidden" id="add_debarment" name="add_debarment" value="0" />	1397	<input type="hidden" id="add_debarment" name="add_debarment" value="0" />
1399	<legend id="manual_restriction_lgd">Add manual restriction</legend>	1398	<legend id="manual_restriction_lgd">Add manual restriction</legend>
Lines 1402-1413 legend:hover { Link Here
1402	<li>	1401	<li>
1403	<label for="debarred_type">Type:</label>	1402	<label for="debarred_type">Type:</label>
1404	<select name="debarred_type">	1403	<select name="debarred_type">
1405	[% FOREACH code IN restriction_types.keys %]	1404	[% FOREACH restriction_type IN restriction_types %]
1406	[% IF !restriction_types.$code.is_system %]	1405	[% IF !restriction_type.is_system %]
1407	[% IF restriction_types.$code.is_default %]	1406	[% IF restriction_type.is_default %]
1408	<option value="[% code \| html %]" selected>[% PROCESS restriction_type_description restriction=restriction_types.$code %]</option>	1407	<option value="[% code \| html %]" selected>[% PROCESS restriction_type_description %]</option>
1409	[% ELSE %]	1408	[% ELSE %]
1410	<option value="[% code \| html %]">[% PROCESS restriction_type_description restriction=restriction_types.$code %]</option>	1409	<option value="[% code \| html %]">[% PROCESS restriction_type_description %]</option>
1411	[% END %]	1410	[% END %]
1412	[% END %]	1411	[% END %]
1413	[% END %]	1412	[% END %]

Lines 35-41 use C4::Form::MessagingPreferences; Link Here

(-)a/members/memberentry.pl (-4 / +2 lines)
35	use Koha::AuthUtils;	35	use Koha::AuthUtils;
36	use Koha::AuthorisedValues;	36	use Koha::AuthorisedValues;
37	use Koha::Email;	37	use Koha::Email;
38	use Koha::Patron::Debarments qw( AddDebarment DelDebarment GetDebarments );	38	use Koha::Patron::Debarments qw( AddDebarment DelDebarment );
39	use Koha::Patron::Restriction::Types;	39	use Koha::Patron::Restriction::Types;
40	use Koha::Cities;	40	use Koha::Cities;
41	use Koha::DateUtils qw( dt_from_string );	41	use Koha::DateUtils qw( dt_from_string );
Lines 118-125 foreach my $id ( @delete_guarantor ) { Link Here
118		118
119	## Deal with debarments	119	## Deal with debarments
120	$template->param(	120	$template->param(
121	debarments => scalar GetDebarments( { borrowernumber => $borrowernumber } ),	121	restriction_types => scalar Koha::Patron::Restriction::Types->search()
122	restriction_types => scalar Koha::Patron::Restriction::Types->keyed_on_code()
123	);	122	);
124	my @debarments_to_remove = $input->multi_param('remove_debarment');	123	my @debarments_to_remove = $input->multi_param('remove_debarment');
125	foreach my $d ( @debarments_to_remove ) {	124	foreach my $d ( @debarments_to_remove ) {
126	-