projects
/
koha.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ffzg/recall_notices.pl: added --interval and --dedup
[koha.git]
/
members
/
maninvoice.pl
diff --git
a/members/maninvoice.pl
b/members/maninvoice.pl
index
a1be118
..
668136a
100755
(executable)
--- a/
members/maninvoice.pl
+++ b/
members/maninvoice.pl
@@
-33,12
+33,22
@@
use C4::Items;
use C4::Members::Attributes qw(GetBorrowerAttributes);
use Koha::Token;
use C4::Members::Attributes qw(GetBorrowerAttributes);
use Koha::Token;
+use Koha::Items;
use Koha::Patrons;
use Koha::Patron::Categories;
my $input=new CGI;
my $flagsrequired = { borrowers => 'edit_borrowers' };
use Koha::Patrons;
use Koha::Patron::Categories;
my $input=new CGI;
my $flagsrequired = { borrowers => 'edit_borrowers' };
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+ { template_name => "members/maninvoice.tt",
+ query => $input,
+ type => "intranet",
+ authnotrequired => 0,
+ flagsrequired => $flagsrequired,
+ debug => 1,
+ }
+);
my $borrowernumber=$input->param('borrowernumber');
my $borrowernumber=$input->param('borrowernumber');
@@
-51,7
+61,7
@@
unless ( $patron ) {
my $add=$input->param('add');
if ($add){
if ( checkauth( $input, 0, $flagsrequired, 'intranet' ) ) {
my $add=$input->param('add');
if ($add){
if ( checkauth( $input, 0, $flagsrequired, 'intranet' ) ) {
- die "Wrong CSRF token"
+ output_and_exit( $input, $cookie, $template, 'wrong_csrf_token' )
unless Koha::Token->new->check_csrf( {
session_id => scalar $input->cookie('CGISESSID'),
token => scalar $input->param('csrf_token'),
unless Koha::Token->new->check_csrf( {
session_id => scalar $input->cookie('CGISESSID'),
token => scalar $input->param('csrf_token'),
@@
-61,23
+71,15
@@
if ($add){
my $barcode=$input->param('barcode');
my $itemnum;
if ($barcode) {
my $barcode=$input->param('barcode');
my $itemnum;
if ($barcode) {
- $itemnum = GetItemnumberFromBarcode($barcode);
+ my $item = Koha::Items->find({barcode => $barcode});
+ $itemnum = $item->itemnumber if $item;
}
my $desc=$input->param('desc');
my $amount=$input->param('amount');
my $type=$input->param('type');
my $note = $input->param('note');
}
my $desc=$input->param('desc');
my $amount=$input->param('amount');
my $type=$input->param('type');
my $note = $input->param('note');
- my $error = manualinvoice( $borrowernumber, $itemnum, $desc, $type, $amount, $note );
+ my $error =
C4::Accounts::
manualinvoice( $borrowernumber, $itemnum, $desc, $type, $amount, $note );
if ($error) {
if ($error) {
- my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
- { template_name => "members/maninvoice.tt",
- query => $input,
- type => "intranet",
- authnotrequired => 0,
- flagsrequired => $flagsrequired,
- debug => 1,
- }
- );
if ( $error =~ /FOREIGN KEY/ && $error =~ /itemnumber/ ) {
$template->param( 'ITEMNUMBER' => 1 );
}
if ( $error =~ /FOREIGN KEY/ && $error =~ /itemnumber/ ) {
$template->param( 'ITEMNUMBER' => 1 );
}
@@
-85,6
+87,11
@@
if ($add){
$template->param( 'ERROR' => $error );
output_html_with_http_headers $input, $cookie, $template->output;
} else {
$template->param( 'ERROR' => $error );
output_html_with_http_headers $input, $cookie, $template->output;
} else {
+
+ if ( C4::Context->preference('AccountAutoReconcile') ) {
+ $patron->account->reconcile_balance;
+ }
+
print $input->redirect("/cgi-bin/koha/members/boraccount.pl?borrowernumber=$borrowernumber");
exit;
}
print $input->redirect("/cgi-bin/koha/members/boraccount.pl?borrowernumber=$borrowernumber");
exit;
}