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

(-)a/admin/categories.pl (-3 lines)
Lines 63-69 if ( $op eq 'add_form' ) { Link Here
63
    my $upperagelimit                          = $input->param('upperagelimit');
63
    my $upperagelimit                          = $input->param('upperagelimit');
64
    my $dateofbirthrequired                    = $input->param('dateofbirthrequired');
64
    my $dateofbirthrequired                    = $input->param('dateofbirthrequired');
65
    my $enrolmentfee                           = $input->param('enrolmentfee');
65
    my $enrolmentfee                           = $input->param('enrolmentfee');
66
    my $reservefee                             = $input->param('reservefee');
67
    my $hidelostitems                          = $input->param('hidelostitems');
66
    my $hidelostitems                          = $input->param('hidelostitems');
68
    my $overduenoticerequired                  = $input->param('overduenoticerequired');
67
    my $overduenoticerequired                  = $input->param('overduenoticerequired');
69
    my $category_type                          = $input->param('category_type');
68
    my $category_type                          = $input->param('category_type');
Lines 103-109 if ( $op eq 'add_form' ) { Link Here
103
        $category->upperagelimit($upperagelimit);
102
        $category->upperagelimit($upperagelimit);
104
        $category->dateofbirthrequired($dateofbirthrequired);
103
        $category->dateofbirthrequired($dateofbirthrequired);
105
        $category->enrolmentfee($enrolmentfee);
104
        $category->enrolmentfee($enrolmentfee);
106
        $category->reservefee($reservefee);
107
        $category->hidelostitems($hidelostitems);
105
        $category->hidelostitems($hidelostitems);
108
        $category->overduenoticerequired($overduenoticerequired);
106
        $category->overduenoticerequired($overduenoticerequired);
109
        $category->category_type($category_type);
107
        $category->category_type($category_type);
Lines 142-148 if ( $op eq 'add_form' ) { Link Here
142
                upperagelimit                          => $upperagelimit,
140
                upperagelimit                          => $upperagelimit,
143
                dateofbirthrequired                    => $dateofbirthrequired,
141
                dateofbirthrequired                    => $dateofbirthrequired,
144
                enrolmentfee                           => $enrolmentfee,
142
                enrolmentfee                           => $enrolmentfee,
145
                reservefee                             => $reservefee,
146
                hidelostitems                          => $hidelostitems,
143
                hidelostitems                          => $hidelostitems,
147
                overduenoticerequired                  => $overduenoticerequired,
144
                overduenoticerequired                  => $overduenoticerequired,
148
                category_type                          => $category_type,
145
                category_type                          => $category_type,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt (-11 lines)
Lines 204-213 Link Here
204
                            [% END %]
204
                            [% END %]
205
                        </select>
205
                        </select>
206
                    </li>
206
                    </li>
207
                    <li>
208
                        <label for="reservefee">Hold fee: </label>
209
                        <input type="text" name="reservefee" id="reservefee" size="6" value="[% category.reservefee | $Price on_editing => 1 %]" />
210
                    </li>
211
                    <li>
207
                    <li>
212
                        <label for="category_type" class="required">Category type: </label>
208
                        <label for="category_type" class="required">Category type: </label>
213
                        <select name="category_type" id="category_type">
209
                        <select name="category_type" id="category_type">
Lines 571-577 Link Here
571
                <tr><th scope="row">Enrollment fee: </th><td>[% category.enrolmentfee | $Price %]</td></tr>
567
                <tr><th scope="row">Enrollment fee: </th><td>[% category.enrolmentfee | $Price %]</td></tr>
572
                <tr><th scope="row">Receives overdue notices: </th><td>[% IF category. overduenoticerequired %]Yes[% ELSE %]No[% END %]</td></tr>
568
                <tr><th scope="row">Receives overdue notices: </th><td>[% IF category. overduenoticerequired %]Yes[% ELSE %]No[% END %]</td></tr>
573
                <tr><th scope="row">Lost items in staff interface:</th><td>[% IF category.hidelostitems %]Hidden by default[% ELSE %]Shown[% END %]</td></tr>
569
                <tr><th scope="row">Lost items in staff interface:</th><td>[% IF category.hidelostitems %]Hidden by default[% ELSE %]Shown[% END %]</td></tr>
574
                <tr><th scope="row">Hold fee: </th><td>[% category.reservefee | $Price %]</td></tr>
575
570
576
                [% IF ( Koha.Preference('CheckPrevCheckout') == 'softyes' || Koha.Preference('CheckPrevCheckout') == 'softno' ) %]
571
                [% IF ( Koha.Preference('CheckPrevCheckout') == 'softyes' || Koha.Preference('CheckPrevCheckout') == 'softno' ) %]
577
                    <tr>
572
                    <tr>
Lines 652-658 Link Here
652
                            <th scope="col" data-colname="enrollment_fee">Enrollment fee</th>
647
                            <th scope="col" data-colname="enrollment_fee">Enrollment fee</th>
653
                            <th scope="col" data-colname="overdue">Overdue</th>
648
                            <th scope="col" data-colname="overdue">Overdue</th>
654
                            <th scope="col" data-colname="lost_items">Lost items</th>
649
                            <th scope="col" data-colname="lost_items">Lost items</th>
655
                            <th scope="col" data-colname="hold_fee">Hold fee</th>
656
                            [% IF ( EnhancedMessagingPreferences ) %]
650
                            [% IF ( EnhancedMessagingPreferences ) %]
657
                                <th scope="col" data-colname="messaging">Messaging</th>
651
                                <th scope="col" data-colname="messaging">Messaging</th>
658
                            [% END %]
652
                            [% END %]
Lines 726-736 Link Here
726
                                [% END %]
720
                                [% END %]
727
                                <td>[% IF ( category.overduenoticerequired ) %]Yes[% ELSE %]No[% END %]</td>
721
                                <td>[% IF ( category.overduenoticerequired ) %]Yes[% ELSE %]No[% END %]</td>
728
                                <td>[% IF ( category.hidelostitems ) %]Hidden[% ELSE %]Shown[% END %]</td>
722
                                <td>[% IF ( category.hidelostitems ) %]Hidden[% ELSE %]Shown[% END %]</td>
729
                                [% IF (category.reservefee > 0) %]
730
                                    <td>[% category.reservefee | $Price %]</td>
731
                                [% ELSE %]
732
                                    <td>-</td>
733
                                [% END %]
734
                                [% IF Koha.Preference('EnhancedMessagingPreferences') %]
723
                                [% IF Koha.Preference('EnhancedMessagingPreferences') %]
735
                                    <td style="white-space: nowrap; font-size:80%;">
724
                                    <td style="white-space: nowrap; font-size:80%;">
736
                                        [% SET default_messaging = category.default_messaging %]
725
                                        [% SET default_messaging = category.default_messaging %]
(-)a/koha-tmpl/intranet-tmpl/prog/js/categories.js (-3 lines)
Lines 94-102 $(document).ready(function () { Link Here
94
            enrolmentfee: {
94
            enrolmentfee: {
95
                number: true,
95
                number: true,
96
            },
96
            },
97
            reservefee: {
98
                number: true,
99
            },
100
            category_type: {
97
            category_type: {
101
                required: true,
98
                required: true,
102
            },
99
            },
(-)a/koha-tmpl/intranet-tmpl/prog/js/onboarding.js (-4 lines)
Lines 141-149 $(document).ready(function () { Link Here
141
            enrolmentfee: {
141
            enrolmentfee: {
142
                number: true,
142
                number: true,
143
            },
143
            },
144
            reservefee: {
145
                number: true,
146
            },
147
            category_type: {
144
            category_type: {
148
                required: true,
145
                required: true,
149
            },
146
            },
150
- 

Return to bug 3492