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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt (-16 / +15 lines)
Lines 823-831 Link Here
823
                            </tr>
823
                            </tr>
824
                            [% FOREACH c IN categorycodes %]
824
                            [% FOREACH c IN categorycodes %]
825
                                [% NEXT UNLESS c %]
825
                                [% NEXT UNLESS c %]
826
                                [% SET patron_maxissueqty = CirculationRules.Search( branchcode, c, undef, 'patron_maxissueqty' ) %]
826
                                [% SET i = undef %]
827
                                [% SET patron_maxonsiteissueqty = CirculationRules.Search( branchcode, c, undef, 'patron_maxonsiteissueqty' ) %]
827
                                [% SET patron_maxissueqty = all_rules.$c.$i.patron_maxissueqty %]
828
                                [% SET max_holds = CirculationRules.Search( branchcode, c, undef, 'max_holds' ) %]
828
                                [% SET patron_maxonsiteissueqty = all_rules.$c.$i.patron_maxonsiteissueqty %]
829
                                [% SET max_holds = all_rules.$c.$i.max_holds %]
829
830
830
                                [% IF  ( patron_maxissueqty.defined && patron_maxissueqty != '' ) || ( patron_maxonsiteissueqty.defined && patron_maxonsiteissueqty != '' ) || ( max_holds.defined && max_holds != '' ) %]
831
                                [% IF  ( patron_maxissueqty.defined && patron_maxissueqty != '' ) || ( patron_maxonsiteissueqty.defined && patron_maxonsiteissueqty != '' ) || ( max_holds.defined && max_holds != '' ) %]
831
                                <tr>
832
                                <tr>
Lines 901-911 Link Here
901
                                <th>&nbsp;</th>
902
                                <th>&nbsp;</th>
902
                            </tr>
903
                            </tr>
903
                            [% FOREACH c IN categorycodes %]
904
                            [% FOREACH c IN categorycodes %]
904
                                [% SET c = '*' UNLESS c.defined AND c != '' %]
905
                                [% FOREACH i IN itemtypes %]
905
                                [% FOREACH i IN itemtypes %]
906
                                    [% SET i = '*' UNLESS i.defined AND i != '' %]
906
                                    [% SET waiting_hold_cancellation = all_rules.$c.$i.waiting_hold_cancellation %]
907
908
                                    [% SET waiting_hold_cancellation = CirculationRules.Search( current_branch, c, i, 'waiting_hold_cancellation' ) %]
909
907
910
                                    [% IF ( waiting_hold_cancellation.defined && waiting_hold_cancellation != '' ) %]
908
                                    [% IF ( waiting_hold_cancellation.defined && waiting_hold_cancellation != '' ) %]
911
                                        <tr>
909
                                        <tr>
Lines 931-937 Link Here
931
                                                [% END %]
929
                                                [% END %]
932
                                            </td>
930
                                            </td>
933
                                            <td class="actions">
931
                                            <td class="actions">
934
                                                <a href="#" class="del-waiting-hold-cancellation btn btn-default btn-xs" data-categorycode="[% c | html %]" data-itemtype="[% i | html %]" data-branch"[% current_branch | html %]"><i class="fa fa-trash-can"></i> Delete</a>
932
                                                <a href="#" class="del-waiting-hold-cancellation btn btn-default btn-xs" data-categorycode="[% c || '*' | html %]" data-itemtype="[% i|| '*' | html %]" data-branch"[% current_branch | html %]"><i class="fa fa-trash-can"></i> Delete</a>
935
                                            </td>
933
                                            </td>
936
                                        </tr>
934
                                        </tr>
937
                                    [% END %]
935
                                    [% END %]
Lines 986-992 Link Here
986
                            </tr>
984
                            </tr>
987
                            [% FOREACH c IN categorycodes %]
985
                            [% FOREACH c IN categorycodes %]
988
                                [% NEXT UNLESS c %]
986
                                [% NEXT UNLESS c %]
989
                                [% SET open_article_requests_limit = CirculationRules.Search( branchcode, c, undef, 'open_article_requests_limit' ) %]
987
                                [% SET i = undef %]
988
                                [% SET open_article_requests_limit = all_rules.$c.$i.open_article_requests_limit %]
990
989
991
                                [% IF ( open_article_requests_limit.defined && open_article_requests_limit != '' ) %]
990
                                [% IF ( open_article_requests_limit.defined && open_article_requests_limit != '' ) %]
992
                                <tr>
991
                                <tr>
Lines 1040-1048 Link Here
1040
                                <th>&nbsp;</th>
1039
                                <th>&nbsp;</th>
1041
                            </tr>
1040
                            </tr>
1042
                            [% FOREACH c IN categorycodes %]
1041
                            [% FOREACH c IN categorycodes %]
1043
                                [% SET c = '*' UNLESS c.defined AND c != '' %]
1042
                                [% SET i = undef %]
1044
1043
                                [% SET article_request_fee = all_rules.$c.$i.article_request_fee %]
1045
                                [% SET article_request_fee = CirculationRules.Search( current_branch, c, undef, 'article_request_fee' ) %]
1046
1044
1047
                                [% IF ( article_request_fee.defined && article_request_fee != '' ) %]
1045
                                [% IF ( article_request_fee.defined && article_request_fee != '' ) %]
1048
                                <tr>
1046
                                <tr>
Lines 1306-1314 Link Here
1306
                                <th>&nbsp;</th>
1304
                                <th>&nbsp;</th>
1307
                            </tr>
1305
                            </tr>
1308
                            [% FOREACH i IN itemtypeloop %]
1306
                            [% FOREACH i IN itemtypeloop %]
1309
                                [% SET holdallowed = CirculationRules.Search( branchcode, undef, i.itemtype, 'holdallowed' ) %]
1307
                                [% SET it = i.itemtype %]
1310
                                [% SET hold_fulfillment_policy = CirculationRules.Search( branchcode, undef, i.itemtype, 'hold_fulfillment_policy' ) %]
1308
                                [% SET c = undef %]
1311
                                [% SET returnbranch = CirculationRules.Search( branchcode, undef, i.itemtype, 'returnbranch' ) %]
1309
                                [% SET holdallowed = all_rules.$c.$it.holdallowed %]
1310
                                [% SET hold_fulfillment_policy = all_rules.$c.$it.hold_fulfillment_policy %]
1311
                                [% SET returnbranch = all_rules.$c.$it.returnbranch %]
1312
1312
1313
                                [% IF holdallowed || hold_fulfillment_policy || returnbranch %]
1313
                                [% IF holdallowed || hold_fulfillment_policy || returnbranch %]
1314
                                    <tr>
1314
                                    <tr>
1315
- 

Return to bug 36672