@@ -, +, @@
---
C4/Accounts.pm | 8 ++++----
.../prog/en/modules/members/boraccount.tt | 2 +-
.../intranet-tmpl/prog/en/modules/members/pay.tt | 2 +-
.../prog/en/modules/members/paycollect.tt | 4 ++++
members/pay.pl | 4 +++-
members/paycollect.pl | 7 ++++---
6 files changed, 17 insertions(+), 10 deletions(-)
--- a/C4/Accounts.pm
+++ a/C4/Accounts.pm
@@ -685,7 +685,7 @@ will be credited to the next one.
=cut
sub recordpayment_selectaccts {
- my ( $borrowernumber, $amount, $accts ) = @_;
+ my ( $borrowernumber, $amount, $accts, $note ) = @_;
my $dbh = C4::Context->dbh;
my $newamtos = 0;
@@ -728,9 +728,9 @@ sub recordpayment_selectaccts {
# create new line
$sql = 'INSERT INTO accountlines ' .
- '(borrowernumber, accountno,date,amount,description,accounttype,amountoutstanding,manager_id) ' .
- q|VALUES (?,?,now(),?,'Payment,thanks','Pay',?,?)|;
- $dbh->do($sql,{},$borrowernumber, $nextaccntno, 0 - $amount, 0 - $amountleft, $manager_id );
+ '(borrowernumber, accountno,date,amount,description,accounttype,amountoutstanding,manager_id,note) ' .
+ q|VALUES (?,?,now(),?,'Payment,thanks','Pay',?,?,?)|;
+ $dbh->do($sql,{},$borrowernumber, $nextaccntno, 0 - $amount, 0 - $amountleft, $manager_id, $note );
UpdateStats( $branch, 'payment', $amount, '', '', '', $borrowernumber, $nextaccntno );
return;
}
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
@@ -45,7 +45,7 @@
[% IF ( loop.odd ) %]
[% ELSE %]
[% END %]
[% account.date %] |
[% account.description %] [% IF ( account.itemnumber ) %]View item [% END %][% account.title |html %] |
- [% account.note %] |
+ [% account.note | html_line_break %] |
[% IF ( account.amountcredit ) %][% ELSE %] | [% END %][% account.amount %] |
[% IF ( account.amountoutstandingcredit ) %][% ELSE %] | [% END %][% account.amountoutstanding %] |
[% IF ( reverse_col ) %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
@@ -88,7 +88,7 @@
[% END %]
[% line.description %] ([% line.title |html_entity %]) |
- |
+ |
[% line.accounttype %] |
[% line.notify_id %] |
[% line.notify_level %] |
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
@@ -204,6 +204,10 @@ function moneyFormat(textObj) {
+
+
+
+
--- a/members/pay.pl
+++ a/members/pay.pl
@@ -266,10 +266,12 @@ sub payselected {
}
$amt = '&amt=' . $amt;
my $sel = '&selected=' . join ',', @lines_to_pay;
+ my $notes = '¬es=' . join("%0A", map { $input->param("payment_note_$_") } @lines_to_pay );
my $redirect =
"/cgi-bin/koha/members/paycollect.pl?borrowernumber=$borrowernumber"
. $amt
- . $sel;
+ . $sel
+ . $notes;
print $input->redirect($redirect);
return;
--- a/members/paycollect.pl
+++ a/members/paycollect.pl
@@ -93,7 +93,8 @@ if ( $individual || $writeoff ) {
$total_due = $input->param('amt');
$template->param(
selected_accts => $select_lines,
- amt => $total_due
+ amt => $total_due,
+ selected_accts_notes => $input->param('notes'),
);
}
@@ -120,8 +121,8 @@ if ( $total_paid and $total_paid ne '0.00' ) {
$select = $1; # ensure passing no junk
}
my @acc = split /,/, $select;
- recordpayment_selectaccts( $borrowernumber, $total_paid,
- \@acc );
+ my $note = $input->param('selected_accts_notes');
+ recordpayment_selectaccts( $borrowernumber, $total_paid, \@acc, $note );
} else {
recordpayment( $borrowernumber, $total_paid );
}
--