From fbac51c6e73a8e5c956eab38107721118b6a8cfb Mon Sep 17 00:00:00 2001 From: Tobias Reimann Date: Fri, 12 Aug 2016 09:43:11 -0700 Subject: [PATCH] Bug 17101 - Confirm a question before check in MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch enable the checkin message type question. This type ask the user before the item is check in, yes or no. Only if he click yes then the item is checked in. Test plan: 1. Create an itemtype, with the checkinmsgtype question 2. Create an item with the itemtype from 1 3. Check out the item from 2 4. Check in the item from 3 5. Click no ==> item shouldn't be check in and a message should be displayed 6. Check in the item from 3 7. Click yes ==> item should be check in and a message should be displayed Optional: Before step 4 check others item in, to check if the prevouis check in's are still shown. Sponsored-by: Bücherei Maichingen --- circ/returns.pl | 10 ++++++++++ koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 11 ++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/circ/returns.pl b/circ/returns.pl index 3e050a6..f233248 100755 --- a/circ/returns.pl +++ b/circ/returns.pl @@ -278,6 +278,16 @@ if ($barcode) { ); } } + elsif($itemtype->checkinmsgtype eq 'question' && $accept == '1'){ + $template->param( + checkinmsgtype => "accepted", + ); + } + elsif($itemtype->checkinmsgtype eq 'question' && $accept == '2'){ + $template->param( + checkinmsgtype => "rejected", + ); + } # make sure return branch respects home branch circulation rules, default to homebranch my $hbr = GetBranchItemRule($biblio->{'homebranch'}, $itemtype ? $itemtype->itemtype : undef )->{'returnbranch'} || "homebranch"; 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 eeb7626..f6f4a5c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -548,7 +548,16 @@ $(document).ready(function () { [% END%] - +[% IF checkinmsgtype == 'accepted' %] +
+

Your item was checked in!

+
+[% END %] +[% IF checkinmsgtype == 'rejected' %] +
+

Your item was not checked in!

+
+[% END %] -- 2.7.4