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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc (+11 lines)
Lines 1-4 Link Here
1
[% USE raw %]
1
[% USE raw %]
2
[% USE Koha %]
2
<div id="reldebarments">
3
<div id="reldebarments">
3
    [% IF ( not debarments.defined || debarments.size < 1 ) %]
4
    [% IF ( not debarments.defined || debarments.size < 1 ) %]
4
        <p>Patron is currently unrestricted.</p>
5
        <p>Patron is currently unrestricted.</p>
Lines 51-56 Link Here
51
            <fieldset class="rows" id="manual_restriction_form">
52
            <fieldset class="rows" id="manual_restriction_form">
52
                <legend>Add manual restriction</legend>
53
                <legend>Add manual restriction</legend>
53
                <ol>
54
                <ol>
55
                    [% IF Koha.Preference('PatronRestrictionTypes') %]
56
                    <li>
57
                        <label for="debarred_type">Type:</label>
58
                        <select name="debarred_type">
59
                            [% FOREACH code IN restriction_types.keys %]
60
                                <option value="[% code | html %]">[% restriction_types.$code.display_text | html %]</option>
61
                            [% END %]
62
                        </select>
63
                    </li>
64
                    [% END %]
54
                    <li><label for="rcomment">Comment:</label> <input type="text" id="rcomment" name="comment" /></li>
65
                    <li><label for="rcomment">Comment:</label> <input type="text" id="rcomment" name="comment" /></li>
55
                    <li><label for="rexpiration">Expiration:</label> <input name="expiration" id="rexpiration" size="10" value="" class="datepicker" type="text" />
66
                    <li><label for="rexpiration">Expiration:</label> <input name="expiration" id="rexpiration" size="10" value="" class="datepicker" type="text" />
56
                        <a href="#" class="clear-date" id="clear-date-rexpiration">Clear date</a></li>
67
                        <a href="#" class="clear-date" id="clear-date-rexpiration">Clear date</a></li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (+10 lines)
Lines 1044-1049 Link Here
1044
                        <input type="hidden" id="add_debarment" name="add_debarment" value="0" />
1044
                        <input type="hidden" id="add_debarment" name="add_debarment" value="0" />
1045
                        <legend id="manual_restriction_lgd">Add manual restriction</legend>
1045
                        <legend id="manual_restriction_lgd">Add manual restriction</legend>
1046
                        <ol>
1046
                        <ol>
1047
                            [% IF Koha.Preference('PatronRestrictionTypes') %]
1048
                            <li>
1049
                                <label for="debarred_type">Type:</label>
1050
                                <select name="debarred_type">
1051
                                    [% FOREACH code IN restriction_types.keys %]
1052
                                        <option value="[% code | html %]">[% restriction_types.$code.display_text | html %]</option>
1053
                                    [% END %]
1054
                                </select>
1055
                            </li>
1056
                            [% END %]
1047
                            <li><label for="debarred_comment">Comment: </label><input type="text" id="debarred_comment" name="debarred_comment" onchange="$('#add_debarment').val(1);" /></li>
1057
                            <li><label for="debarred_comment">Comment: </label><input type="text" id="debarred_comment" name="debarred_comment" onchange="$('#add_debarment').val(1);" /></li>
1048
                            <li><label for="debarred_expiration">Expiration: </label><input name="debarred_expiration" id="debarred_expiration" size="10" value="" class="datepicker" onchange="$('#add_debarment').val(1);" type="text" />
1058
                            <li><label for="debarred_expiration">Expiration: </label><input name="debarred_expiration" id="debarred_expiration" size="10" value="" class="datepicker" onchange="$('#add_debarment').val(1);" type="text" />
1049
                                    <a href='javascript:void(0)' onclick="$('#debarred_expiration').val('');">Clear date</a></li>
1059
                                    <a href='javascript:void(0)' onclick="$('#debarred_expiration').val('');">Clear date</a></li>
(-)a/members/memberentry.pl (-2 / +2 lines)
Lines 139-145 if ( $input->param('add_debarment') ) { Link Here
139
    AddDebarment(
139
    AddDebarment(
140
        {
140
        {
141
            borrowernumber => $borrowernumber,
141
            borrowernumber => $borrowernumber,
142
            type           => 'MANUAL',
142
            type           => scalar $input->param('debarred_type') // 'MANUAL',
143
            comment        => scalar $input->param('debarred_comment'),
143
            comment        => scalar $input->param('debarred_comment'),
144
            expiration     => $expiration,
144
            expiration     => $expiration,
145
        }
145
        }
Lines 236-242 if ( $op eq 'insert' || $op eq 'modify' || $op eq 'save' || $op eq 'duplicate' ) Link Here
236
        qr/^\d+-DAYS/,
236
        qr/^\d+-DAYS/,
237
        qr/^patron_attr_/,
237
        qr/^patron_attr_/,
238
        qr/^csrf_token$/,
238
        qr/^csrf_token$/,
239
        qr/^add_debarment$/, qr/^debarred_expiration$/, qr/^remove_debarment$/, # We already dealt with debarments previously
239
        qr/^add_debarment$/, qr/^debarred_expiration$/, qr/^debarred_type$/, qr/^remove_debarment$/, # We already dealt with debarments previously
240
        qr/^housebound_chooser$/, qr/^housebound_deliverer$/,
240
        qr/^housebound_chooser$/, qr/^housebound_deliverer$/,
241
        qr/^select_city$/,
241
        qr/^select_city$/,
242
        qr/^new_guarantor_/,
242
        qr/^new_guarantor_/,
(-)a/members/mod_debarment.pl (-2 / +2 lines)
Lines 44-49 if ( $action eq 'del' ) { Link Here
44
    DelDebarment( scalar $cgi->param('borrower_debarment_id') );
44
    DelDebarment( scalar $cgi->param('borrower_debarment_id') );
45
} elsif ( $action eq 'add' ) {
45
} elsif ( $action eq 'add' ) {
46
    my $expiration = $cgi->param('expiration');
46
    my $expiration = $cgi->param('expiration');
47
    my $type = $cgi->param('debarred_type') // 'MANUAL';
47
    if ($expiration) {
48
    if ($expiration) {
48
        $expiration = dt_from_string($expiration);
49
        $expiration = dt_from_string($expiration);
49
        $expiration = $expiration->ymd();
50
        $expiration = $expiration->ymd();
Lines 51-57 if ( $action eq 'del' ) { Link Here
51
52
52
    AddDebarment(
53
    AddDebarment(
53
        {   borrowernumber => $borrowernumber,
54
        {   borrowernumber => $borrowernumber,
54
            type           => 'MANUAL',
55
            type           => $type,
55
            comment        => scalar $cgi->param('comment'),
56
            comment        => scalar $cgi->param('comment'),
56
            expiration     => $expiration,
57
            expiration     => $expiration,
57
        }
58
        }
58
- 

Return to bug 23681