From 957402909fd618903db372f4721d4763b6f901fb Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Thu, 6 Jun 2019 12:42:46 -0400
Subject: [PATCH] Bug 23057: Update subroutine so tests pass

---
 C4/SIP/ILS/Transaction/Checkin.pm | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/C4/SIP/ILS/Transaction/Checkin.pm b/C4/SIP/ILS/Transaction/Checkin.pm
index 67d0b1d792..4adce52605 100644
--- a/C4/SIP/ILS/Transaction/Checkin.pm
+++ b/C4/SIP/ILS/Transaction/Checkin.pm
@@ -70,13 +70,12 @@ sub do_checkin {
 
     $debug and warn "do_checkin() calling AddReturn($barcode, $branch)";
     my ($return, $messages, $issue, $borrower) = AddReturn($barcode, $branch, undef, dt_from_string($return_date));
-    if ($checked_in_ok){
-        $debug and warn 'not raising alert when AddReturn() does not return a value for $return due to $checked_in_ok being set to true';
-    }
-    else {
-        $self->alert(!$return);
+
+    if ( $checked_in_ok ) {
+        delete $messages->{NotIssued};
+        delete $messages->{LocalUse};
+        $return = 1 unless keys %$messages;
     }
-    # ignoring messages: NotIssued, WasLost, WasTransfered
 
     # biblionumber, biblioitemnumber, itemnumber
     # borrowernumber, reservedate, branchcode
@@ -126,12 +125,16 @@ sub do_checkin {
         $self->{item}->hold_patron_id( $messages->{ResFound}->{borrowernumber} );
         $self->{item}->destination_loc( $messages->{ResFound}->{branchcode} );
     }
+    # ignoring messages: NotIssued, WasLost, WasTransfered
+
+    $self->alert(!$return) unless $checked_in_ok;
+    $debug and $checked_in_ok and warn 'Not raising alert when AddReturn() does not return a value for $return due to $checked_in_ok being set to true';
 
-    my $alert = defined $self->alert_type;
+    my $has_alert_type = defined $self->alert_type;
     if ( $cv_triggers_alert ) {
-        $self->alert($alert); # Overwrites existing alert value, should set to 0 if there is no alert type
+        $self->alert($has_alert_type); # Overwrites existing alert value, should set to 0 if there is no alert type
     } else {
-        $self->alert($alert) if $alert; # Doesn't affect alert value unless an alert type is set
+        $self->alert($has_alert_type) if $has_alert_type; # Doesn't affect alert value unless an alert type is set
     }
 
     $self->ok($return);
-- 
2.20.1 (Apple Git-117)