Attachment 108237 Details for Bug 25261 – Bug 25261: (QA follow-up) Non-confirm on return

[patch] Bug 25261: (QA follow-up) Non-confirm on return

Bug-25261-QA-follow-up-Non-confirm-on-return.patch (text/plain), 5.77 KB, created by Martin Renvoize (ashimema) on 2020-08-14 06:15:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2020-08-14 06:15:56 UTC

Size: 5.77 KB

patch

obsolete

>From 5980476638cb0988ff5b25123701f33f3b16a5ce Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Fri, 24 Jul 2020 12:05:29 +0100
>Subject: [PATCH] Bug 25261: (QA follow-up) Non-confirm on return
>
>This patch updates the confirmation from an alert to a dismissable modal
>which allows for optionally not checking the item in
>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> circ/returns.pl                               |  1 +
> .../prog/en/modules/circ/returns.tt           | 53 ++++++++++---------
> 2 files changed, 29 insertions(+), 25 deletions(-)
>
>diff --git a/circ/returns.pl b/circ/returns.pl
>index 0a2288aac3..dc3eb3c6b0 100755
>--- a/circ/returns.pl
>+++ b/circ/returns.pl
>@@ -300,6 +300,7 @@ if ($barcode) {
>          C4::Context->preference("CircConfirmItemParts")
>       && $item->materials
>       && !$query->param('multiple_confirm');
>+    $template->param('multiple_confirmed' => 1) if $query->param('multiple_confirm');
> 
>     # do the return
>     ( $returned, $messages, $issue, $borrower ) =
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>index 6fdb56e0f1..68f0124b79 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>@@ -118,30 +118,7 @@
>                                 </div>
>                             [% END %]
> 
>-                            [% IF needs_confirm %]
>-                                <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 %]
>+                            [% IF additional_materials && !multiple_confirmed %]
>                                 <div class="dialog alert">
>                                     <ul>
>                                         <li>
>@@ -149,7 +126,6 @@
>                                         </li>
>                                     </ul>
>                                 </div>
>-                                [% END %]
>                             [% END %]
> 
>                             [% IF ( collectionItemNeedsTransferred ) %]
>@@ -326,6 +302,33 @@
>                             [% 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">
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 25261: 103856 | 103857 | 104011 | 104012 | 104013 | 104404 | 104405 | 104406 | 104407 | 104408 | 104409 | 104410 | 104411 | 104412 | 104413 | 104414 | 107217 | 107218 | 107219 | 107220 | 107221 | 107222 | 107228 | 107229 | 107230 | 107231 | 107232 | 107233 | 107234 | 107285 | 107331 | 107822 | 107823 | 108196 | 108197 | 108198 | 108199 | 108200 | 108201 | 108202 | 108203 | 108204 | 108205 | 108206 | 108207 | 108208 | 108230 | 108231 | 108232 | 108233 | 108234 | 108235 | 108236 | 108237 | 108238 | 108239 | 108240 | 108241 | 108242 | 109478 | 109479 | 109480 | 109481 | 109482 | 109483 | 109484 | 109485 | 109486 | 109487 | 109488 | 109489 | 109490 | 109491 | 109492 | 109493 | 109494 | 109495 | 109496 | 109497 | 109498 | 109499 | 109500 | 109501 | 109502 | 109503 | 109504 | 109508 | 110038 | 110039 | 110040 | 110041 | 110042 | 110043 | 110044 | 110045 | 110046 | 110047 | 110048 | 110049 | 110050 | 110051 | 110052 | 110133 | 110184 | 110258 | 110259 | 110268 | 110322 | 110323 | 110324 | 110325 | 110326 | 110327 | 110328 | 110329 | 110330 | 110331 | 110332 | 110333 | 110334 | 110335 | 110336 | 110337 | 110338 | 110339 | 110340 | 110341 | 110356 | 110357 | 110358 | 110359 | 110360 | 110361 | 110362 | 110363 | 110364 | 110365 | 110366 | 110367 | 110368 | 110369 | 110370 | 110371 | 110372 | 110373 | 110374 | 110375 | 110915 | 110916 | 110917 | 110918 | 110919 | 110920 | 110921 | 110922 | 110923 | 110924 | 110925 | 110926 | 110927 | 110928 | 110929 | 110930 | 110931 | 110932 | 110933 | 110934 | 111027