From fee35db20e84ab7c10365adf58224e7a8b329cdd Mon Sep 17 00:00:00 2001
From: Kyle Hall <kyle@bywatersolutions.com>
Date: Wed, 20 Mar 2019 17:37:56 +0000
Subject: [PATCH] Bug 22540: (QA follow-up) fixes

borrowernumber is not an accessor for C4::SIP::ILS::Patron, access is
via hashref

Add ability to specify the pickup location using a command line
parameter

Signed-off-by: Liz Rea <wizzyrea@gmail.com>

https://bugs.koha-community.org/show_bug.cgi?id=22330
Signed-off-by: frederik chenier <frederik.chenier@inlibro.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 C4/SIP/ILS/Transaction/Hold.pm |  2 +-
 misc/sip_cli_emulator.pl       | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/C4/SIP/ILS/Transaction/Hold.pm b/C4/SIP/ILS/Transaction/Hold.pm
index 63e1a06dbb..825e89b9db 100644
--- a/C4/SIP/ILS/Transaction/Hold.pm
+++ b/C4/SIP/ILS/Transaction/Hold.pm
@@ -54,7 +54,7 @@ sub do_hold {
         $self->ok(0);
         return $self;
     }
-    my $branch = ( $self->pickup_location || $self->{patron}->branchcode );
+    my $branch = ( $self->pickup_location || $self->{patron}->{branchcode} );
     unless ($branch) {
         $self->screen_msg('No branch specified (or found w/ patron).');
         $self->ok(0);
diff --git a/misc/sip_cli_emulator.pl b/misc/sip_cli_emulator.pl
index fa440bc4cd..5f4b326a26 100755
--- a/misc/sip_cli_emulator.pl
+++ b/misc/sip_cli_emulator.pl
@@ -52,6 +52,7 @@ my $currency_type;
 my $fee_amount;
 my $fee_identifier;
 my $transaction_id;
+my $pickup_location;
 
 my $terminator = q{};
 
@@ -73,12 +74,13 @@ GetOptions(
 
     "s|summary=s" => \$summary,
 
-    "fee-type=s"       => \$fee_type,
-    "payment-type=s"   => \$payment_type,
-    "currency-type=s"  => \$currency_type,
-    "fee-amount=s"     => \$fee_amount,
-    "fee-identifier=s" => \$fee_identifier,
-    "transaction-id=s" => \$transaction_id,
+    "fee-type=s"        => \$fee_type,
+    "payment-type=s"    => \$payment_type,
+    "currency-type=s"   => \$currency_type,
+    "fee-amount=s"      => \$fee_amount,
+    "fee-identifier=s"  => \$fee_identifier,
+    "transaction-id=s"  => \$transaction_id,
+    "pickup-location=s" => \$pickup_location,
 
     "t|terminator=s" => \$terminator,
 
@@ -265,7 +267,7 @@ my $handlers = {
             hold_mode           => '+',
             transaction_date    => $transaction_date,
             expiration_date     => undef,
-            pickup_location     => undef,
+            pickup_location     => $pickup_location,
             hold_type           => undef,
             institution_id      => $location_code,
             patron_identifier   => $patron_identifier,
@@ -636,6 +638,7 @@ Options:
   --fee-amount      Fee amount for Fee Paid message, required
   --fee-identifier  Fee identifier for Fee Paid message, optional
   --transaction-id  Transaction id for Fee Paid message, optional
+  --pickup-location Pickup location (branchcode) for Hold message, optional
 
   -m --message     SIP2 message to execute
 
-- 
2.11.0