@@ -, +, @@ payment_type_writeoff="06" in the login portion of the account you will be using for the test. defined earlier, with a payment amount that is *not* equal to the amount outstanding for the fee. payment amount --- C4/SIP/ILS.pm | 7 +++---- C4/SIP/ILS/Transaction/FeePayment.pm | 22 +++++++++++++++++++--- C4/SIP/Sip/MsgType.pm | 5 ++++- etc/SIPconfig.xml | 2 +- 4 files changed, 27 insertions(+), 9 deletions(-) --- a/C4/SIP/ILS.pm +++ a/C4/SIP/ILS.pm @@ -247,10 +247,9 @@ sub end_patron_session { } sub pay_fee { - my ($self, $patron_id, $patron_pwd, $fee_amt, $fee_type, $pay_type, $fee_id, $trans_id, $currency) = @_; - my $trans; + my ($self, $patron_id, $patron_pwd, $fee_amt, $fee_type, $pay_type, $fee_id, $trans_id, $currency, $is_writeoff) = @_; - $trans = C4::SIP::ILS::Transaction::FeePayment->new(); + my $trans = C4::SIP::ILS::Transaction::FeePayment->new(); $trans->transaction_id($trans_id); my $patron; @@ -259,7 +258,7 @@ sub pay_fee { $trans->screen_msg('Invalid patron barcode.'); return $trans; } - my $ok =$trans->pay($patron->{borrowernumber},$fee_amt, $pay_type, $fee_id); + my $ok = $trans->pay( $patron->{borrowernumber}, $fee_amt, $pay_type, $fee_id, $is_writeoff ); $trans->ok($ok); return $trans; --- a/C4/SIP/ILS/Transaction/FeePayment.pm +++ a/C4/SIP/ILS/Transaction/FeePayment.pm @@ -45,8 +45,11 @@ sub pay { my $self = shift; my $borrowernumber = shift; my $amt = shift; - my $type = shift; + my $sip_type = shift; my $fee_id = shift; + my $is_writeoff = shift; + + my $type = $is_writeoff ? 'writeoff' : undef; warn("RECORD:$borrowernumber::$amt"); @@ -55,7 +58,14 @@ sub pay { if ($fee_id) { my $fee = Koha::Account::Lines->find($fee_id); if ( $fee && $fee->amountoutstanding == $amt ) { - $account->pay( { amount => $amt, sip => $type, lines => [$fee] } ); + $account->pay( + { + amount => $amt, + sip => $sip_type, + type => $type, + lines => [$fee], + } + ); return 1; } else { @@ -63,7 +73,13 @@ sub pay { } } else { - $account->pay( { amount => $amt, sip => $type } ); + $account->pay( + { + amount => $amt, + sip => $sip_type, + type => $type, + } + ); return 1; } } --- a/C4/SIP/Sip/MsgType.pm +++ a/C4/SIP/Sip/MsgType.pm @@ -1068,6 +1068,9 @@ sub handle_fee_paid { my $status; my $resp = FEE_PAID_RESP; + my $payment_type_writeoff = $server->{account}->{payment_type_writeoff}; + my $is_writeoff = $pay_type eq $payment_type_writeoff; + $fee_amt = $fields->{ (FID_FEE_AMT) }; $inst_id = $fields->{ (FID_INST_ID) }; $patron_id = $fields->{ (FID_PATRON_ID) }; @@ -1077,7 +1080,7 @@ sub handle_fee_paid { $ils->check_inst_id( $inst_id, "handle_fee_paid" ); - $status = $ils->pay_fee( $patron_id, $patron_pwd, $fee_amt, $fee_type, $pay_type, $fee_id, $trans_id, $currency ); + $status = $ils->pay_fee( $patron_id, $patron_pwd, $fee_amt, $fee_type, $pay_type, $fee_id, $trans_id, $currency, $is_writeoff ); $resp .= ( $status->ok ? 'Y' : 'N' ) . timestamp; $resp .= add_field( FID_INST_ID, $inst_id ); --- a/etc/SIPconfig.xml +++ a/etc/SIPconfig.xml @@ -44,7 +44,7 @@ - + --