projects
/
koha-ffzg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 11349: Change .tmpl -> .tt in scripts using templates
[koha-ffzg.git]
/
members
/
paycollect.pl
diff --git
a/members/paycollect.pl
b/members/paycollect.pl
index
7dfb622
..
37b7713
100755
(executable)
--- a/
members/paycollect.pl
+++ b/
members/paycollect.pl
@@
-19,6
+19,7
@@
use strict;
use warnings;
use strict;
use warnings;
+use URI::Escape;
use C4::Context;
use C4::Auth;
use C4::Output;
use C4::Context;
use C4::Auth;
use C4::Output;
@@
-30,12
+31,13
@@
use C4::Branch;
my $input = CGI->new();
my $input = CGI->new();
+my $updatecharges_permissions = $input->param('writeoff_individual') ? 'writeoff' : 'remaining_permissions';
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
- { template_name => 'members/paycollect.t
mpl
',
+ { template_name => 'members/paycollect.t
t
',
query => $input,
type => 'intranet',
authnotrequired => 0,
query => $input,
type => 'intranet',
authnotrequired => 0,
- flagsrequired => { borrowers => 1, updatecharges =>
1
},
+ flagsrequired => { borrowers => 1, updatecharges =>
$updatecharges_permissions
},
debug => 1,
}
);
debug => 1,
}
);
@@
-55,8
+57,9
@@
my $individual = $input->param('pay_individual');
my $writeoff = $input->param('writeoff_individual');
my $select_lines = $input->param('selected');
my $select = $input->param('selected_accts');
my $writeoff = $input->param('writeoff_individual');
my $select_lines = $input->param('selected');
my $select = $input->param('selected_accts');
+my $payment_note = uri_unescape $input->param('payment_note');
my $accountno;
my $accountno;
-
+my $accountlines_id;
if ( $individual || $writeoff ) {
if ($individual) {
$template->param( pay_individual => 1 );
if ( $individual || $writeoff ) {
if ($individual) {
$template->param( pay_individual => 1 );
@@
-64,6
+67,7
@@
if ( $individual || $writeoff ) {
$template->param( writeoff_individual => 1 );
}
my $accounttype = $input->param('accounttype');
$template->param( writeoff_individual => 1 );
}
my $accounttype = $input->param('accounttype');
+ $accountlines_id = $input->param('accountlines_id');
my $amount = $input->param('amount');
my $amountoutstanding = $input->param('amountoutstanding');
$accountno = $input->param('accountno');
my $amount = $input->param('amount');
my $amountoutstanding = $input->param('amountoutstanding');
$accountno = $input->param('accountno');
@@
-75,6
+79,7
@@
if ( $individual || $writeoff ) {
$total_due = $amountoutstanding;
$template->param(
accounttype => $accounttype,
$total_due = $amountoutstanding;
$template->param(
accounttype => $accounttype,
+ accountlines_id => $accountlines_id,
accountno => $accountno,
amount => $amount,
amountoutstanding => $amountoutstanding,
accountno => $accountno,
amount => $amount,
amountoutstanding => $amountoutstanding,
@@
-83,29
+88,31
@@
if ( $individual || $writeoff ) {
description => $description,
notify_id => $notify_id,
notify_level => $notify_level,
description => $description,
notify_id => $notify_id,
notify_level => $notify_level,
+ payment_note => $payment_note,
);
} elsif ($select_lines) {
$total_due = $input->param('amt');
$template->param(
selected_accts => $select_lines,
);
} elsif ($select_lines) {
$total_due = $input->param('amt');
$template->param(
selected_accts => $select_lines,
- amt => $total_due
+ amt => $total_due,
+ selected_accts_notes => $input->param('notes'),
);
}
if ( $total_paid and $total_paid ne '0.00' ) {
if ( $total_paid < 0 or $total_paid > $total_due ) {
$template->param(
);
}
if ( $total_paid and $total_paid ne '0.00' ) {
if ( $total_paid < 0 or $total_paid > $total_due ) {
$template->param(
- error
=> sprintf( 'You must pay a value less than or equal to %f.2'
,
- $total_due )
+ error
_over => 1
,
+ total_due => $total_due
);
} else {
if ($individual) {
if ( $total_paid == $total_due ) {
);
} else {
if ($individual) {
if ( $total_paid == $total_due ) {
- makepayment( $borrowernumber, $accountno, $total_paid, $user,
- $branch );
+ makepayment( $
accountlines_id, $
borrowernumber, $accountno, $total_paid, $user,
+ $branch
, $payment_note
);
} else {
} else {
- makepartialpayment( $borrowernumber, $accountno, $total_paid,
- $user, $branch );
+ makepartialpayment( $
accountlines_id, $
borrowernumber, $accountno, $total_paid,
+ $user, $branch
, $payment_note
);
}
print $input->redirect(
"/cgi-bin/koha/members/pay.pl?borrowernumber=$borrowernumber");
}
print $input->redirect(
"/cgi-bin/koha/members/pay.pl?borrowernumber=$borrowernumber");
@@
-115,8
+122,8
@@
if ( $total_paid and $total_paid ne '0.00' ) {
$select = $1; # ensure passing no junk
}
my @acc = split /,/, $select;
$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 );
}
} else {
recordpayment( $borrowernumber, $total_paid );
}
@@
-139,6
+146,7
@@
$template->param(
borrower => $borrower,
total => $total_due,
activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
borrower => $borrower,
total => $total_due,
activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
+ RoutingSerials => C4::Context->preference('RoutingSerials'),
);
output_html_with_http_headers $input, $cookie, $template->output;
);
output_html_with_http_headers $input, $cookie, $template->output;
@@
-162,7
+170,7
@@
sub borrower_add_additional_fields {
} elsif ( $b_ref->{category_type} eq 'A' ) {
$b_ref->{adultborrower} = 1;
}
} elsif ( $b_ref->{category_type} eq 'A' ) {
$b_ref->{adultborrower} = 1;
}
- my ( $picture, $dberror ) = GetPatronImage( $b_ref->{
card
number} );
+ my ( $picture, $dberror ) = GetPatronImage( $b_ref->{
borrower
number} );
if ($picture) {
$b_ref->{has_picture} = 1;
}
if ($picture) {
$b_ref->{has_picture} = 1;
}