From 86378bf011123da4ed6e56226aa36aebf1530fa8 Mon Sep 17 00:00:00 2001
From: Tobias Reimann <T.Reimann95@gmx.de>
Date: Fri, 12 Aug 2016 10:02: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

    Added a messag when an item is not checked in, becaus of answer no.

    (new) 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

    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                                         | 5 -----
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/circ/returns.pl b/circ/returns.pl
index f233248..2a384ee 100755
--- a/circ/returns.pl
+++ b/circ/returns.pl
@@ -278,11 +278,6 @@ if ($barcode) {
         	);
     	}
     }
-    elsif($itemtype->checkinmsgtype eq 'question' && $accept == '1'){
-	$template->param(
-	checkinmsgtype	=> "accepted",
-	);
-    }
     elsif($itemtype->checkinmsgtype eq 'question' && $accept == '2'){
 	$template->param(
 	checkinmsgtype	=> "rejected",
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 f6f4a5c..dc667b2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -548,11 +548,6 @@ $(document).ready(function () {
            </form>
         </div>
 [% END%]
-[% IF checkinmsgtype == 'accepted' %]
-	<div class="dialog alert">
-		<p class="problem">Your item was checked in!</p>
-	</div>
-[% END %]
 [% IF checkinmsgtype == 'rejected' %]
 	<div class="dialog alert">
 		<p class="problem">Your item was not checked in!</p>
-- 
2.7.4