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

(-)a/Koha/CirculationRules.pm (-1 / +1 lines)
Lines 190-196 sub get_effective_rule { Link Here
190
    }
190
    }
191
191
192
    my $order_by = $params->{order_by}
192
    my $order_by = $params->{order_by}
193
      // { -desc => [ 'branchcode', 'categorycode', 'itemtype', 'checkout_type' ] };
193
      // { -desc => [ 'branchcode', 'checkout_type', 'categorycode', 'itemtype', ] };
194
194
195
    my $search_params;
195
    my $search_params;
196
    $search_params->{rule_name} = $rule_name;
196
    $search_params->{rule_name} = $rule_name;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt (-23 / +23 lines)
Lines 93-101 Link Here
93
            <table id="default-circulation-rules">
93
            <table id="default-circulation-rules">
94
            <thead>
94
            <thead>
95
            <tr>
95
            <tr>
96
                <th>Checkout type</th>
96
                <th>Patron category</th>
97
                <th>Patron category</th>
97
                <th>Item type</th>
98
                <th>Item type</th>
98
                <th>Checkout type</th>
99
                <th>Actions</th>
99
                <th>Actions</th>
100
                <th>Note</th>
100
                <th>Note</th>
101
                <th>Current checkouts allowed</th>
101
                <th>Current checkouts allowed</th>
Lines 129-139 Link Here
129
            </thead>
129
            </thead>
130
            <tbody>
130
            <tbody>
131
                [% SET row_count = 0 %]
131
                [% SET row_count = 0 %]
132
                [% FOREACH c IN categorycodes %]
132
                [% FOREACH ct IN checkout_types %]
133
                    [% SET c = '' UNLESS c.defined %]
133
                    [% FOREACH c IN categorycodes %]
134
                    [% FOREACH i IN itemtypes %]
134
                        [% SET c = '' UNLESS c.defined %]
135
                        [% FOREACH i IN itemtypes %]
135
                        [% SET i = '' UNLESS i.defined %]
136
                        [% SET i = '' UNLESS i.defined %]
136
                        [% FOREACH ct IN checkout_types %]
137
                            [% SET ct = '' UNLESS ct.defined %]
137
                            [% SET ct = '' UNLESS ct.defined %]
138
                            [% SET note = all_rules.$c.$i.$ct.note %]
138
                            [% SET note = all_rules.$c.$i.$ct.note %]
139
                            [% SET maxissueqty = all_rules.$c.$i.$ct.maxissueqty %]
139
                            [% SET maxissueqty = all_rules.$c.$i.$ct.maxissueqty %]
Lines 168-195 Link Here
168
                                [% SET row_count = row_count + 1 %]
168
                                [% SET row_count = row_count + 1 %]
169
                                <tr row_countd="row_[% row_count | html %]">
169
                                <tr row_countd="row_[% row_count | html %]">
170
                                        <td>
170
                                        <td>
171
                                            [% IF c == undef %]
171
                                            [% IF ct == undef %]
172
                                                <em>All</em>
172
                                                <em>All</em>
173
                                            [% ELSE %]
173
                                            [% ELSE %]
174
                                                [% Categories.GetName(c) | html %]
174
                                                [% IF ct == 'CHECKOUT' %]
175
                                                    <em>Normal checkout</em>
176
                                                [% ELSIF ct == 'ONSITE' %]
177
                                                    <em>On-site checkout</em>
178
                                                [% END %]
175
                                            [% END %]
179
                                            [% END %]
176
                                        </td>
180
                                        </td>
177
                                        <td>
181
                                        <td>
178
                                            [% IF i == undef %]
182
                                            [% IF c == undef %]
179
                                                <em>All</em>
183
                                                <em>All</em>
180
                                            [% ELSE %]
184
                                            [% ELSE %]
181
                                                [% ItemTypes.GetDescription(i) | html %]
185
                                                [% Categories.GetName(c) | html %]
182
                                            [% END %]
186
                                            [% END %]
183
                                        </td>
187
                                        </td>
184
                                        <td>
188
                                        <td>
185
                                            [% IF ct == undef %]
189
                                            [% IF i == undef %]
186
                                                <em>All</em>
190
                                                <em>All</em>
187
                                            [% ELSE %]
191
                                            [% ELSE %]
188
                                                [% IF ct == 'CHECKOUT' %]
192
                                                [% ItemTypes.GetDescription(i) | html %]
189
                                                    <em>Normal checkout</em>
190
                                                [% ELSIF ct == 'ONSITE' %]
191
                                                    <em>On-site checkout</em>
192
                                                [% END %]
193
                                            [% END %]
193
                                            [% END %]
194
                                        </td>
194
                                        </td>
195
                                        <td class="actions">
195
                                        <td class="actions">
Lines 322-327 Link Here
322
                    [% END %]
322
                    [% END %]
323
                [% END %]
323
                [% END %]
324
                <tr id="edit_row">
324
                <tr id="edit_row">
325
                    <td>
326
                        <select name="checkout_type" id="matrixcheckout_type" style="width:13em;">
327
                            <option value="*">All</option>
328
                            <option value="CHECKOUT">Normal checkout</option>
329
                            <option value="ONSITE">On-site checkout</option>
330
                        </select>
331
                    </td>
325
                    <td>
332
                    <td>
326
                        <select name="categorycode" id="categorycode">
333
                        <select name="categorycode" id="categorycode">
327
                            <option value="*">All</option>
334
                            <option value="*">All</option>
Lines 338-350 Link Here
338
                        [% END %]
345
                        [% END %]
339
                        </select>
346
                        </select>
340
                    </td>
347
                    </td>
341
                    <td>
342
                        <select name="checkout_type" id="matrixcheckout_type" style="width:13em;">
343
                            <option value="*">All</option>
344
                            <option value="CHECKOUT">Normal checkout</option>
345
                            <option value="ONSITE">On-site checkout</option>
346
                        </select>
347
                    </td>
348
                    <td class="actions">
348
                    <td class="actions">
349
                        <input type="hidden" name="branch" value="[% current_branch | html %]"/>
349
                        <input type="hidden" name="branch" value="[% current_branch | html %]"/>
350
                        <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button>
350
                        <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button>
Lines 430-438 Link Here
430
                </tr>
430
                </tr>
431
                <tfoot>
431
                <tfoot>
432
                    <tr>
432
                    <tr>
433
                      <th>Checkout type</th>
433
                      <th>Patron category</th>
434
                      <th>Patron category</th>
434
                      <th>Item type</th>
435
                      <th>Item type</th>
435
                      <th>Checkout type</th>
436
                      <th>&nbsp;</th>
436
                      <th>&nbsp;</th>
437
                      <th>Note</th>
437
                      <th>Note</th>
438
                      <th>Current checkouts allowed</th>
438
                      <th>Current checkouts allowed</th>
(-)a/t/db_dependent/Koha/CirculationRules.t (-2 / +1 lines)
Lines 288-294 sub prepare_tests_for_rule_scope_combinations { Link Here
288
    # We must maintain the order in order to keep the test valid. This should be
288
    # We must maintain the order in order to keep the test valid. This should be
289
    # equal to Koha/CirculationRules.pm "order_by" of C<get_effective_rule> sub.
289
    # equal to Koha/CirculationRules.pm "order_by" of C<get_effective_rule> sub.
290
    # Let's explicitly define the order and fail test if we are missing a scope:
290
    # Let's explicitly define the order and fail test if we are missing a scope:
291
    my $order = [ 'branchcode', 'categorycode', 'itemtype', 'checkout_type' ];
291
    my $order = [ 'branchcode', 'checkout_type', 'categorycode', 'itemtype' ];
292
    is( join(", ", sort keys %$scope),
292
    is( join(", ", sort keys %$scope),
293
       join(", ", sort @$order), 'Missing a scope!' ) if keys %$scope ne scalar @$order;
293
       join(", ", sort @$order), 'Missing a scope!' ) if keys %$scope ne scalar @$order;
294
294
295
- 

Return to bug 25089