From 833c46570fc8f6e8b2eb6e36af80bf8f13bc7447 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. --- Koha/Account/Line.pm | 6 ++++-- .../intranet-tmpl/prog/en/modules/members/boraccount.tt | 5 ++++- members/boraccount.pl | 8 ++++++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Koha/Account/Line.pm b/Koha/Account/Line.pm index e35338512e..75e6733167 100644 --- a/Koha/Account/Line.pm +++ b/Koha/Account/Line.pm @@ -723,7 +723,8 @@ sub apply { register_id => $register_id, staff_id => $staff_id, interface => 'intranet', - amount => $amount + amount => $amount, + note => $note } ); @@ -788,7 +789,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 fb0e734418..de8767b4ac 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt @@ -340,7 +340,10 @@ [% END %] - +
  • + + +
  • diff --git a/members/boraccount.pl b/members/boraccount.pl index e3b85e7e77..23d2cc574c 100755 --- a/members/boraccount.pl +++ b/members/boraccount.pl @@ -128,6 +128,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 { @@ -137,7 +139,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' ) { @@ -148,7 +151,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.2