From 3003162a03fa92855ce2ddf15ebfebbb753d1890 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Tue, 27 Dec 2022 20:32:10 +0000 Subject: [PATCH] Bug 32515: Ignore no-block flag in check-in message Bug 12225 changed the templates to correctly pass through the no-block flag, however, we don't have a no-block routine for checkins This patch restore previous behaviour of performing a normal checkin when no block was requested - it adds a new FIXME To test: 1 - See bug 32537 https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32537 2 - Repeat test plan on that bug, noting that there is no response when no-block = Y 3 - Apply this patch 4 - Repeat the tests and confirm no-block = Y has a standard checkin response Signed-off-by: David Nind Signed-off-by: Blou Signed-off-by: Martin Renvoize Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 30fcbb44370048f6ad53d71225a0f40c6d27fbb1) Signed-off-by: Matt Blenkinsop (cherry picked from commit a7e914151c7d8a55ae45d670a41c9a7d4c200503) Signed-off-by: Lucas Gass --- C4/SIP/Sip/MsgType.pm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/C4/SIP/Sip/MsgType.pm b/C4/SIP/Sip/MsgType.pm index 4c17bc13ac..adca21689b 100644 --- a/C4/SIP/Sip/MsgType.pm +++ b/C4/SIP/Sip/MsgType.pm @@ -672,8 +672,11 @@ sub handle_checkin { if ( $no_block eq 'Y' ) { # Off-line transactions, ick. - siplog( "LOG_WARNING", "received no-block checkin from terminal '%s'", $account->{id} ); - $status = $ils->checkin_no_block( $item_id, $trans_date, $return_date, $item_props, $cancel ); + siplog( "LOG_WARNING", "received no-block checkin from terminal '%s' - no-block checkin not supported", $account->{id} ); + #FIXME We need to write the routine called below + #$status = $ils->checkin_no_block( $item_id, $trans_date, $return_date, $item_props, $cancel ); + #Until we do, lets just checkin the item + $status = $ils->checkin( $item_id, $trans_date, $return_date, $my_branch, $item_props, $cancel, $account ); } else { $status = $ils->checkin( $item_id, $trans_date, $return_date, $my_branch, $item_props, $cancel, $account ); } -- 2.39.5