From d9e5f394dd5b19f97f06aae9996c9c6f5e99dc4c Mon Sep 17 00:00:00 2001 From: Sam Lau Date: Wed, 26 Jun 2024 19:06:48 +0000 Subject: [PATCH] Bug 23674: Add ability to add a note to issue refund To test: 1) Apply patch, restart_all 2) From patron accounting page -> Create manual invoice. Enter some amount and select save and pay. Press confirm. 3) In the transactions tab, for the invoice you just created, under the actions column select issue refund. 4) This should open a modal with the ability to enter a note for the refund. Type in a note and confirm. 5) Ensure the note correctly shows in the table. Signed-off-by: Roman Dolny Signed-off-by: Martin Renvoize --- Koha/Account/Line.pm | 6 ++++-- .../intranet-tmpl/prog/en/modules/members/boraccount.tt | 4 ++++ members/boraccount.pl | 8 ++++++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Koha/Account/Line.pm b/Koha/Account/Line.pm index a2b008acbdd..9fa86bf0854 100644 --- a/Koha/Account/Line.pm +++ b/Koha/Account/Line.pm @@ -703,7 +703,8 @@ sub apply { register_id => $register_id, staff_id => $staff_id, interface => 'intranet', - amount => $amount + amount => $amount, + note => $note } ); @@ -763,7 +764,8 @@ sub payout { borrowernumber => $self->borrowernumber, interface => $params->{interface}, branchcode => $params->{branch}, - register_id => $params->{cash_register} + register_id => $params->{cash_register}, + note => $params->{note}, } )->store(); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt index 1dc5ef7bae0..5a23f38ce6d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt @@ -369,6 +369,10 @@ [% END %] +
  • + + +
  • diff --git a/members/boraccount.pl b/members/boraccount.pl index b237e437c08..4798e8ed41a 100755 --- a/members/boraccount.pl +++ b/members/boraccount.pl @@ -134,6 +134,8 @@ if ( $op eq 'cud-refund' ) { my $charge = Koha::Account::Lines->find($charge_id); my $amount = scalar $input->param('amount'); my $refund_type = scalar $input->param('refund_type'); + my $note = scalar $input->param('refund_note'); + $schema->txn_do( sub { @@ -143,7 +145,8 @@ if ( $op eq 'cud-refund' ) { branch => $library_id, staff_id => $logged_in_user->id, interface => 'intranet', - amount => $amount + amount => $amount, + note => $note } ); unless ( $refund_type eq 'AC' ) { @@ -154,7 +157,8 @@ if ( $op eq 'cud-refund' ) { staff_id => $logged_in_user->id, cash_register => $registerid, interface => 'intranet', - amount => $amount + amount => $amount, + note => $note } ); } -- 2.39.5