Attachment #110922 for bug #25261

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

Lines 299-304 if ($barcode) { Link Here

(-)a/circ/returns.pl (+1 lines)
299	C4::Context->preference("CircConfirmItemParts")	299	C4::Context->preference("CircConfirmItemParts")
300	&& $item->materials	300	&& $item->materials
301	&& !$query->param('multiple_confirm');	301	&& !$query->param('multiple_confirm');
		302	$template->param('multiple_confirmed' => 1) if $query->param('multiple_confirm');
302		303
303	# do the return	304	# do the return
304	( $returned, $messages, $issue, $borrower ) =	305	( $returned, $messages, $issue, $borrower ) =




                                </div>
                            [% END %]

                            [% IF additional_materials && !multiple_confirmed %]
                                <div id="circ_needsconfirmation" class="dialog alert audio-alert-action">
                                    <h3>Please confirm checkin</h3>
                                    <ul>
                                        [% IF additional_materials %]
                                        <li>
                                        Please confirm that the accompanying materials are present: [% additional_materials | html %]
                                        </li>
                                        [% END %]
                                    </ul>

                                    <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
                                        <input type="hidden" name="barcode" value="[% itembarcode | html %]" />

                                        [% IF additional_materials %]
                                        <input type="hidden" name="multiple_confirm" value="1" />
                                        [% END %]

                                        <button type="submit" class="approve" accesskey="y"><i class="fa fa-check"></i> Yes, checkin (Y)</button>
                                        <button type="submit" class="deny" accesskey="n"><i class="fa fa-times"></i> No, don't checkin (N)</button>
                                    </form>
                                </div>
                            [% ELSE %]
                                [% IF additional_materials %]
                                <div class="dialog alert">
                                    <ul>
                                        <li>

                                        </li>
                                    </ul>
                                </div>
                                [% END %]
                            [% END %]

                            [% IF ( collectionItemNeedsTransferred ) %]

                            [% END # /IF checkinmsg %]
                        [% END # /BLOCK all_checkin_messages %]

                        [% IF needs_confirm %]
                            <div id="circ-needsconfirmation-modal" class="modal fade audio-alert-action block">
                                <div class="modal-dialog">
                                    <div class="modal-content">
                                        <div class="modal-header">
                                            <h3>Please confirm checkin</h3>
                                        </div>
                                        <div class="modal-body">
                                            <ul>
                                                <li>
                                                    Please confirm that the accompanying materials are present: [% additional_materials | html %]
                                                </li>
                                            </ul>
                                        </div>
                                        <div class="modal-footer">
                                            <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
                                                <input type="hidden" name="barcode" value="[% itembarcode | html %]" />
                                                <input type="hidden" name="multiple_confirm" value="1" />
                                                <button type="submit" class="approve" accesskey="y"><i class="fa fa-check"></i> Yes, checkin (Y)</button>
                                            </form>
                                            <button type="button" data-dismiss="modal" class="deny" accesskey="n"><i class="fa fa-times"></i> No, don't checkin (N)</button>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        [% END %]

                        [% IF wrongbranch %]
                            <div id="wrong-branch-modal" class="modal fade audio-alert-action block">
                                <div class="modal-dialog">
- 

Return to bug 25261

Lines 118-147 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-26 / +28 lines)
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 328-333 Link Here
328	[% END # /IF checkinmsg %]	304	[% END # /IF checkinmsg %]
329	[% END # /BLOCK all_checkin_messages %]	305	[% END # /BLOCK all_checkin_messages %]
330		306
		307	[% IF needs_confirm %]
		308	<div id="circ-needsconfirmation-modal" class="modal fade audio-alert-action block">
		309	<div class="modal-dialog">
		310	<div class="modal-content">
		311	<div class="modal-header">
		312	<h3>Please confirm checkin</h3>
		313	</div>
		314	<div class="modal-body">
		315	<ul>
		316	<li>
		317	Please confirm that the accompanying materials are present: [% additional_materials \| html %]
		318	</li>
		319	</ul>
		320	</div>
		321	<div class="modal-footer">
		322	<form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
		323	<input type="hidden" name="barcode" value="[% itembarcode \| html %]" />
		324	<input type="hidden" name="multiple_confirm" value="1" />
		325	<button type="submit" class="approve" accesskey="y"><i class="fa fa-check"></i> Yes, checkin (Y)</button>
		326	</form>
		327	<button type="button" data-dismiss="modal" class="deny" accesskey="n"><i class="fa fa-times"></i> No, don't checkin (N)</button>
		328	</div>
		329	</div>
		330	</div>
		331	</div>
		332	[% END %]
		333
331	[% IF wrongbranch %]	334	[% IF wrongbranch %]
332	<div id="wrong-branch-modal" class="modal fade audio-alert-action block">	335	<div id="wrong-branch-modal" class="modal fade audio-alert-action block">
333	<div class="modal-dialog">	336	<div class="modal-dialog">
334	-