From dcaefd891becf885701ac6da65f7f0569d257735 Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Wed, 2 Sep 2020 08:54:08 -0400
Subject: [PATCH] Bug 25541: (QA follow-up) Rename no_holds_checkin to
 holds_block_checkin

---
 C4/SIP/ILS.pm                     | 4 ++--
 C4/SIP/ILS/Transaction/Checkin.pm | 4 ++--
 debian/templates/SIPconfig.xml    | 2 +-
 etc/SIPconfig.xml                 | 2 +-
 t/db_dependent/SIP/Message.t      | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/C4/SIP/ILS.pm b/C4/SIP/ILS.pm
index 80c14de718..54f9c2839c 100644
--- a/C4/SIP/ILS.pm
+++ b/C4/SIP/ILS.pm
@@ -201,7 +201,7 @@ sub checkin {
 
     my $checked_in_ok     = $account->{checked_in_ok};
     my $cv_triggers_alert = $account->{cv_triggers_alert};
-    my $no_holds_checkin  = $account->{no_holds_checkin};
+    my $holds_block_checkin  = $account->{holds_block_checkin};
 
     my ( $patron, $item, $circ );
 
@@ -225,7 +225,7 @@ sub checkin {
     if ( !$circ->ok && $circ->alert_type && $circ->alert_type == 98 ) { # data corruption
         $circ->screen_msg("Checkin failed: data problem");
         siplog( "LOG_WARNING", "Problem with issue_id in issues and old_issues; check the about page" );
-    } elsif ( $data->{messages}->{ResFound} && !$circ->ok && $no_holds_checkin ) {
+    } elsif ( $data->{messages}->{ResFound} && !$circ->ok && $holds_block_checkin ) {
         $circ->screen_msg("Item is on hold, please return to circulation desk");
         siplog ("LOG_DEBUG", "C4::SIP::ILS::Checkin - item withdrawn");
     } elsif ( $data->{messages}->{withdrawn} && !$circ->ok && C4::Context->preference("BlockReturnOfWithdrawnItems") ) {
diff --git a/C4/SIP/ILS/Transaction/Checkin.pm b/C4/SIP/ILS/Transaction/Checkin.pm
index 8c54bfb6ec..07797a0d4d 100644
--- a/C4/SIP/ILS/Transaction/Checkin.pm
+++ b/C4/SIP/ILS/Transaction/Checkin.pm
@@ -52,7 +52,7 @@ sub do_checkin {
 
     my $checked_in_ok     = $account->{checked_in_ok};
     my $cv_triggers_alert = $account->{cv_triggers_alert};
-    my $no_holds_checkin  = $account->{no_holds_checkin};
+    my $holds_block_checkin  = $account->{holds_block_checkin};
 
     if (!$branch) {
         $branch = 'SIP2';
@@ -116,7 +116,7 @@ sub do_checkin {
         $self->alert_type('04');            # send to other branch
     }
     if ($messages->{ResFound}) {
-        if ($no_holds_checkin) {
+        if ($holds_block_checkin) {
             $self->alert_type('99');
             $return = 0;
         } elsif ($branch eq $messages->{ResFound}->{branchcode}) {
diff --git a/debian/templates/SIPconfig.xml b/debian/templates/SIPconfig.xml
index 4fc976c923..9d48351b18 100644
--- a/debian/templates/SIPconfig.xml
+++ b/debian/templates/SIPconfig.xml
@@ -51,7 +51,7 @@
       <login id="lpl-sc-beacock" password="xyzzy"
              delimiter="|" error-detect="enabled" institution="LPL"
              send_patron_home_library_in_af="1"
-             no_holds_checkin="1"
+             holds_block_checkin="1"
              av_field_template="[% accountline.description %] [% accountline.amountoutstanding | format('%.2f') %]" >
           <screen_msg_regex find="Greetings from Koha." replace="Welcome to your library!" />
           <screen_msg_regex find="Invalid patron barcode." replace="Barcode not found, are you sure this is your library card?" />
diff --git a/etc/SIPconfig.xml b/etc/SIPconfig.xml
index 570192614d..44bfd7a140 100644
--- a/etc/SIPconfig.xml
+++ b/etc/SIPconfig.xml
@@ -60,7 +60,7 @@
              av_field_template="[% accountline.description %] [% accountline.amountoutstanding | format('%.2f') %]"
              hide_fields="BD,BE,BF,PB"
              register_id=''
-             no_holds_checkin="1">
+             holds_block_checkin="1">
           <screen_msg_regex find="Greetings from Koha." replace="Welcome to your library!" />
           <screen_msg_regex find="Invalid patron barcode." replace="Barcode not found, are you sure this is your library card?" />
           <patron_attribute field="XY" code="CODE" />
diff --git a/t/db_dependent/SIP/Message.t b/t/db_dependent/SIP/Message.t
index 9690f93c73..d351f69f51 100755
--- a/t/db_dependent/SIP/Message.t
+++ b/t/db_dependent/SIP/Message.t
@@ -601,7 +601,7 @@ sub test_checkin_v2 {
 
     # Test account option no_holds_check that prevents items on hold from being checked in via SIP
     Koha::Old::Checkouts->search({ issue_id => $issue->issue_id })->delete;
-    $server->{account}->{no_holds_checkin} = 1;
+    $server->{account}->{holds_block_checkin} = 1;
     my $reserve_id = AddReserve({
         branchcode     => $branchcode,
         borrowernumber => $patron1->{borrowernumber},
@@ -617,7 +617,7 @@ sub test_checkin_v2 {
     is( substr($response,5,1), 'Y', 'Alert flag is set' );
     check_field( $respcode, $response, FID_SCREEN_MSG, 'Item is on hold, please return to circulation desk', 'Screen message is correct' );
     $hold->delete();
-    $server->{account}->{no_holds_checkin} = 0;
+    $server->{account}->{holds_block_checkin} = 0;
 
 }
 
-- 
2.24.1 (Apple Git-126)