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

(-)a/circ/returns.pl (+1 lines)
Lines 300-305 if ($barcode) { Link Here
300
         C4::Context->preference("CircConfirmItemParts")
300
         C4::Context->preference("CircConfirmItemParts")
301
      && $item->materials
301
      && $item->materials
302
      && !$query->param('multiple_confirm');
302
      && !$query->param('multiple_confirm');
303
    $template->param('multiple_confirmed' => 1) if $query->param('multiple_confirm');
303
304
304
    # do the return
305
    # do the return
305
    ( $returned, $messages, $issue, $borrower ) =
306
    ( $returned, $messages, $issue, $borrower ) =
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-26 / +28 lines)
Lines 118-147 Link Here
118
                                </div>
118
                                </div>
119
                            [% END %]
119
                            [% END %]
120
120
121
                            [% IF needs_confirm %]
121
                            [% IF additional_materials && !multiple_confirmed %]
122
                                <div id="circ_needsconfirmation" class="dialog alert audio-alert-action">
123
                                    <h3>Please confirm checkin</h3>
124
                                    <ul>
125
                                        [% IF additional_materials %]
126
                                        <li>
127
                                        Please confirm that the accompanying materials are present: [% additional_materials | html %]
128
                                        </li>
129
                                        [% END %]
130
                                    </ul>
131
132
                                    <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
133
                                        <input type="hidden" name="barcode" value="[% itembarcode | html %]" />
134
135
                                        [% IF additional_materials %]
136
                                        <input type="hidden" name="multiple_confirm" value="1" />
137
                                        [% END %]
138
139
                                        <button type="submit" class="approve" accesskey="y"><i class="fa fa-check"></i> Yes, checkin (Y)</button>
140
                                        <button type="submit" class="deny" accesskey="n"><i class="fa fa-times"></i> No, don't checkin (N)</button>
141
                                    </form>
142
                                </div>
143
                            [% ELSE %]
144
                                [% IF additional_materials %]
145
                                <div class="dialog alert">
122
                                <div class="dialog alert">
146
                                    <ul>
123
                                    <ul>
147
                                        <li>
124
                                        <li>
Lines 149-155 Link Here
149
                                        </li>
126
                                        </li>
150
                                    </ul>
127
                                    </ul>
151
                                </div>
128
                                </div>
152
                                [% END %]
153
                            [% END %]
129
                            [% END %]
154
130
155
                            [% IF ( collectionItemNeedsTransferred ) %]
131
                            [% IF ( collectionItemNeedsTransferred ) %]
Lines 326-331 Link Here
326
                            [% END # /IF checkinmsg %]
302
                            [% END # /IF checkinmsg %]
327
                        [% END # /BLOCK all_checkin_messages %]
303
                        [% END # /BLOCK all_checkin_messages %]
328
304
305
                        [% IF needs_confirm %]
306
                            <div id="circ-needsconfirmation-modal" class="modal fade audio-alert-action block">
307
                                <div class="modal-dialog">
308
                                    <div class="modal-content">
309
                                        <div class="modal-header">
310
                                            <h3>Please confirm checkin</h3>
311
                                        </div>
312
                                        <div class="modal-body">
313
                                            <ul>
314
                                                <li>
315
                                                    Please confirm that the accompanying materials are present: [% additional_materials | html %]
316
                                                </li>
317
                                            </ul>
318
                                        </div>
319
                                        <div class="modal-footer">
320
                                            <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
321
                                                <input type="hidden" name="barcode" value="[% itembarcode | html %]" />
322
                                                <input type="hidden" name="multiple_confirm" value="1" />
323
                                                <button type="submit" class="approve" accesskey="y"><i class="fa fa-check"></i> Yes, checkin (Y)</button>
324
                                            </form>
325
                                            <button type="button" data-dismiss="modal" class="deny" accesskey="n"><i class="fa fa-times"></i> No, don't checkin (N)</button>
326
                                        </div>
327
                                    </div>
328
                                </div>
329
                            </div>
330
                        [% END %]
331
329
                        [% IF wrongbranch %]
332
                        [% IF wrongbranch %]
330
                            <div id="wrong-branch-modal" class="modal fade audio-alert-action block">
333
                            <div id="wrong-branch-modal" class="modal fade audio-alert-action block">
331
                                <div class="modal-dialog">
334
                                <div class="modal-dialog">
332
- 

Return to bug 25261