From e9c2f0c1fb1f5877bf664a4ab28f2b42a0f03307 Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Mon, 11 Jul 2022 16:57:06 +0000
Subject: [PATCH] Bug 12225: Fix SIP message templates

If a renewal via SIP would produce an error due to being on reserve, or
exceeding maximum renewals, Koha's SIP2 implementation will refuse to
renew the item even if the "no block" flag is set to Y.

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 7a4afce04d36d7452d2065a82ce0899ab0047126)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 C4/SIP/Sip/MsgType.pm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/C4/SIP/Sip/MsgType.pm b/C4/SIP/Sip/MsgType.pm
index 2f7ba7da0f..0de5f1facc 100644
--- a/C4/SIP/Sip/MsgType.pm
+++ b/C4/SIP/Sip/MsgType.pm
@@ -72,12 +72,12 @@ my %handlers = (
         handler  => \&handle_checkout,
         protocol => {
             1 => {
-                template     => "CCA18A18",
+                template     => "A1A1A18A18",
                 template_len => 38,
                 fields       => [ (FID_INST_ID), (FID_PATRON_ID), (FID_ITEM_ID), (FID_TERMINAL_PWD) ],
             },
             2 => {
-                template     => "CCA18A18",
+                template     => "A1A1A18A18",
                 template_len => 38,
                 fields       => [ (FID_INST_ID), (FID_PATRON_ID), (FID_ITEM_ID), (FID_TERMINAL_PWD), (FID_ITEM_PROPS), (FID_PATRON_PWD), (FID_FEE_ACK), (FID_CANCEL) ],
             },
@@ -88,12 +88,12 @@ my %handlers = (
         handler  => \&handle_checkin,
         protocol => {
             1 => {
-                template     => "CA18A18",
+                template     => "A1A18A18",
                 template_len => 37,
                 fields       => [ (FID_CURRENT_LOCN), (FID_INST_ID), (FID_ITEM_ID), (FID_TERMINAL_PWD) ],
             },
             2 => {
-                template     => "CA18A18",
+                template     => "A1A18A18",
                 template_len => 37,
                 fields       => [ (FID_CURRENT_LOCN), (FID_INST_ID), (FID_ITEM_ID), (FID_TERMINAL_PWD), (FID_ITEM_PROPS), (FID_CANCEL) ],
             }
@@ -104,7 +104,7 @@ my %handlers = (
         handler  => \&handle_block_patron,
         protocol => {
             1 => {
-                template     => "CA18",
+                template     => "A1A18",
                 template_len => 19,
                 fields       => [ (FID_INST_ID), (FID_BLOCKED_CARD_MSG), (FID_PATRON_ID), (FID_TERMINAL_PWD) ],
             },
@@ -115,7 +115,7 @@ my %handlers = (
         handler  => \&handle_sc_status,
         protocol => {
             1 => {
-                template     => "CA3A4",
+                template     => "A1A3A4",
                 template_len => 8,
                 fields       => [],
             }
@@ -126,7 +126,7 @@ my %handlers = (
         handler  => \&handle_request_acs_resend,
         protocol => {
             1 => {
-                template     => "",
+                template     => q{},
                 template_len => 0,
                 fields       => [],
             }
@@ -228,7 +228,7 @@ my %handlers = (
         handler  => \&handle_renew,
         protocol => {
             2 => {
-                template     => "CCA18A18",
+                template     => "A1A1A18A18",
                 template_len => 38,
                 fields       => [ (FID_INST_ID), (FID_PATRON_ID), (FID_PATRON_PWD), (FID_ITEM_ID), (FID_TITLE_ID), (FID_TERMINAL_PWD), (FID_ITEM_PROPS), (FID_FEE_ACK) ],
             }
-- 
2.39.5