Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 34764: Set fee_acknowledged to expect a string

Browse source 
For consistency with other options I opted to have the fee acknowledged
parameter to expect a string and as it's an optional parameter I've
dropped the default value of 'N' too.

Test plan
1) Prior to this patch
1a) Attempt a checkout without passing -fa/--fee_acknowledged flag
    `./misc/sip_cli_emulator.pl -a localhost -p 6001 -su term1 -sp term1 -l CPL --patron 23529000035676 --item 39999000007756 -m checkout`
    The final field of the SIP request will be '|BON', the default
1b) Attempt a checkout passing -fa/--fee_acknowledged flag
    `./misc/sip_cli_emulator.pl -a localhost -p 6001 -su term1 -sp term1 -l CPL --fee-acknowledged --patron 23529000035676 --item 39999000007756 -m checkout`
    The final field of the SIP request will still be '|BON', failure
1c) Attempt a checkout passing a string for fee_acknoewledeged flag
    `./misc/sip_cli_emulator.pl -a localhost -p 6001 -su term1 -sp term1 -l CPL --fee-acknowledged Y --patron 23529000035676 --item 39999000007756 -m checkout`
    The final field of the SIP request will still be '|BON', failure
2) Apply the patch
2a) Attempt a checkout without passing -fa/--fee_acknowledged flag
    `./misc/sip_cli_emulator.pl -a localhost -p 6001 -su term1 -sp term1 -l CPL --patron 23529000035676 --item 39999000007756 -m checkout`
    The optional `|BO` element should not be present
2b) Attempt a checkout passing -fa/--fee_acknowledged flag
    `./misc/sip_cli_emulator.pl -a localhost -p 6001 -su term1 -sp term1 -l CPL --fee-acknowledged N --patron 23529000035676 --item 39999000007756 -m checkout`
    The final field of the SIP request will now be '|BON', success
2c) Attempt a checkout passing a string for fee_acknoewledeged flag
    `./misc/sip_cli_emulator.pl -a localhost -p 6001 -su term1 -sp term1 -l CPL --fee-acknowledged Y --patron 23529000035676 --item 39999000007756 -m checkout`
    The final field of the SIP request will now be '|BOY', success

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 0e9603bb49)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
(cherry picked from commit 7c07d7b6a6)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
This commit is contained in:
Martin Renvoize 2023-09-12 14:18:37 +01:00 committed by Matt Blenkinsop
parent 88f1dabcf0
commit 92b794130c
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
misc/sip_cli_emulator.pl
View file

@ -44,7 +44,7 @@ my $summary;
my $item_identifier; my $item_identifier;
my $fee_acknowledged = 0; my $fee_acknowledged;
my $fee_type; my $fee_type;
my $payment_type; my $payment_type;
@ -72,7 +72,7 @@ GetOptions(
"i|item=s" => \$item_identifier, "i|item=s" => \$item_identifier,
"fa|fee-acknowledged" => \$fee_acknowledged, "fa|fee-acknowledged=s" => \$fee_acknowledged,
"s|summary=s" => \$summary, "s|summary=s" => \$summary,
@ -449,12 +449,11 @@ sub build_checkout_command_message {
my $terminal_password = $params->{terminal_password}; my $terminal_password = $params->{terminal_password};
my $item_properties = $params->{item_properties}; my $item_properties = $params->{item_properties};
my $patron_password = $params->{patron_password}; my $patron_password = $params->{patron_password};
my $fee_acknowledged = $params->{fee_acknowledged} || 'N'; my $fee_acknowledged = $params->{fee_acknowledged};
my $cancel = $params->{cancel} || 'N'; my $cancel = $params->{cancel} || 'N';
$SC_renewal_policy = $SC_renewal_policy eq 'Y' ? 'Y' : 'N'; $SC_renewal_policy = $SC_renewal_policy eq 'Y' ? 'Y' : 'N';
$no_block = $no_block eq 'Y' ? 'Y' : 'N'; $no_block = $no_block eq 'Y' ? 'Y' : 'N';
$fee_acknowledged = $fee_acknowledged eq 'Y' ? 'Y' : 'N';
$cancel = $cancel eq 'Y' ? 'Y' : 'N'; $cancel = $cancel eq 'Y' ? 'Y' : 'N';
$nb_due_date ||= $transaction_date; $nb_due_date ||= $transaction_date;
@ -520,7 +519,7 @@ sub build_hold_command_message {
my $item_identifier = $params->{item_identifier}; my $item_identifier = $params->{item_identifier};
my $title_identifier = $params->{title_identifier}; my $title_identifier = $params->{title_identifier};
my $terminal_password = $params->{terminal_password}; my $terminal_password = $params->{terminal_password};
my $fee_acknowledged = $params->{fee_acknowledged} || 'N'; my $fee_acknowledged = $params->{fee_acknowledged};
return return
HOLD HOLD
@ -552,11 +551,10 @@ sub build_renew_command_message {
my $title_identifier = $params->{title_identifier}; my $title_identifier = $params->{title_identifier};
my $terminal_password = $params->{terminal_password}; my $terminal_password = $params->{terminal_password};
my $item_properties = $params->{item_properties}; my $item_properties = $params->{item_properties};
my $fee_acknowledged = $params->{fee_acknowledged} || 'N'; my $fee_acknowledged = $params->{fee_acknowledged};
$third_party_allowed = $third_party_allowed eq 'Y' ? 'Y' : 'N'; $third_party_allowed = $third_party_allowed eq 'Y' ? 'Y' : 'N';
$no_block = $no_block eq 'Y' ? 'Y' : 'N'; $no_block = $no_block eq 'Y' ? 'Y' : 'N';
$fee_acknowledged = $fee_acknowledged eq 'Y' ? 'Y' : 'N';
$nb_due_date ||= $transaction_date; $nb_due_date ||= $transaction_date;
@ -647,7 +645,7 @@ Options:
-t --terminator SIP2 message terminator, either CR, or CRLF -t --terminator SIP2 message terminator, either CR, or CRLF
(defaults to CRLF) (defaults to CRLF)
-fa --fee-acknowledged Sends a confirmation of checkout fee -fa --fee-acknowledged Accepts "Y" to acknowledge a fee, "N" to not acknowledge it
--fee-type Fee type for Fee Paid message, defaults to '01' --fee-type Fee type for Fee Paid message, defaults to '01'
--payment-type Payment type for Fee Paid message, default to '00' --payment-type Payment type for Fee Paid message, default to '00'