From aba91f8c939e26a98e7ff07d2c16d1ee4ecb091d Mon Sep 17 00:00:00 2001 From: Martin Renvoize 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 Signed-off-by: Katrin Fischer --- 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 986a9939eb..fab9976ef7 100755 --- a/circ/returns.pl +++ b/circ/returns.pl @@ -299,6 +299,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 0790f66a7b..bc6760329e 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 @@ [% END %] - [% IF needs_confirm %] -
-

Please confirm checkin

-
    - [% IF additional_materials %] -
  • - Please confirm that the accompanying materials are present: [% additional_materials | html %] -
    • - [% END %] -
- -
- - - [% IF additional_materials %] - - [% END %] - - - -
-
- [% ELSE %] - [% IF additional_materials %] + [% IF additional_materials && !multiple_confirmed %]
  • @@ -149,7 +126,6 @@
- [% END %] [% END %] [% IF ( collectionItemNeedsTransferred ) %] @@ -328,6 +304,33 @@ [% END # /IF checkinmsg %] [% END # /BLOCK all_checkin_messages %] + [% IF needs_confirm %] + + [% END %] + [% IF wrongbranch %]