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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt (-19 / +17 lines)
Lines 121-145 Link Here
121
                <h1>Complete ILL request</h1>
121
                <h1>Complete ILL request</h1>
122
                <p>Proceeding with this action will set this request to 'Completed'.</p>
122
                <p>Proceeding with this action will set this request to 'Completed'.</p>
123
                <p>You can select a status alias from the available options:</p>
123
                <p>You can select a status alias from the available options:</p>
124
                <p>
124
                [% base_url = "/cgi-bin/koha/ill/ill-requests.pl" %]
125
                    [% base_url = "/cgi-bin/koha/ill/ill-requests.pl" %]
125
                [% proceed_url = base_url _ "?method=mark_completed&stage=complete" _ "&illrequest_id=" _ request.illrequest_id %]
126
                    [% proceed_url = base_url _ "?method=mark_completed&stage=complete" _ "&illrequest_id=" _ request.illrequest_id %]
126
                <form action="[% proceed_url | url %]" method="get">
127
                    <form action="[% proceed_url | url %]" method="get">
127
                    <select name="status_alias">
128
                        <select name="status_alias">
128
                        <option value="" selected></option>
129
                            <option value="" selected></option>
129
                        [% FOREACH alias IN AuthorisedValues.Get('ILL_STATUS_ALIAS') %]
130
                            [% FOREACH alias IN AuthorisedValues.Get('ILL_STATUS_ALIAS') %]
130
                            <option value="[% alias.authorised_value | html %]"> [% alias.lib | html %] </option>
131
                                <option value="[% alias.authorised_value | html %]" > [% alias.lib | html %] </option>
131
                        [% END %]
132
                            [% END %]
132
                    </select>
133
                        </select>
133
                    <input type="hidden" name="method" value="mark_completed" />
134
                        <input type="hidden" name="method" value="mark_completed">
134
                    <input type="hidden" name="stage" value="complete" />
135
                        <input type="hidden" name="stage" value="complete">
135
                    <input type="hidden" name="illrequest_id" value="[% request.illrequest_id | html %]" />
136
                        <input type="hidden" name="illrequest_id" value="[% request.illrequest_id | html%]">
136
                    <fieldset class="action">
137
                        <fieldset class="action">
137
                        <button type="submit" class="btn btn-sm btn-primary">Complete request</button>
138
                            <button type="submit" class="btn btn-sm btn-primary">Complete request</button>
138
                        <a class="btn btn-sm btn-default cancel" href="[% base_url | url %]">Cancel</a>
139
                            <a class="btn btn-sm btn-default cancel" href="[% base_url | url %]">Cancel</a>
139
                    </fieldset>
140
                        </fieldset>
140
                </form>
141
                    </form>
142
                </p>
143
            [% ELSIF op == 'cud-cancel' and !whole.error %]
141
            [% ELSIF op == 'cud-cancel' and !whole.error %]
144
                <h1>Cancel a confirmed request</h1>
142
                <h1>Cancel a confirmed request</h1>
145
                [% PROCESS $whole.template %]
143
                [% PROCESS $whole.template %]
(-)a/t/db_dependent/Koha/ILL/Requests.t (-2 / +1 lines)
Lines 194-200 subtest 'Basic object tests' => sub { Link Here
194
194
195
    isnt(
195
    isnt(
196
        $illrq_obj->status, 'COMP',
196
        $illrq_obj->status, 'COMP',
197
        "ILL_STATUS_ALIAS is not empty. ILL is not immediatelly complete."
197
        "ILL_STATUS_ALIAS is not empty. ILL is not immediately complete."
198
    );
198
    );
199
199
200
    is(
200
    is(
201
- 

Return to bug 39917