X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=circ%2Fbilling.pl;h=9c47b75ca4864d206aa9b3ed9aafe928b45a1354;hb=9693db7bff0e900680e388c24e7920ce703f4419;hp=a1586a714440c895a7094e7e381342e92930b9da;hpb=ef8a880b2558f5ea91d9bd6f71689974d28181ee;p=koha_gimpoz
diff --git a/circ/billing.pl b/circ/billing.pl
index a1586a7144..9c47b75ca4 100755
--- a/circ/billing.pl
+++ b/circ/billing.pl
@@ -1,6 +1,5 @@
#!/usr/bin/perl
-
# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
@@ -14,11 +13,12 @@
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
use strict;
+use warnings;
use C4::Context;
use C4::Output;
use CGI;
@@ -28,12 +28,10 @@ use C4::Debug;
use Date::Calc qw/Today Add_Delta_YM/;
my $input = new CGI;
-my $order = $input->param('order');
-my $startdate=$input->param('from');
-my $enddate=$input->param('to');
-my $max_bill=$input->param('ratio');
-
-my $theme = $input->param('theme'); # only used if allowthemeoverride is set
+my $order = $input->param('order') || '';
+my $startdate = $input->param('from') || '';
+my $enddate = $input->param('to') || '';
+my $max_bill = $input->param('ratio') || C4::Context->preference('noissuescharge') || 20.00;
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
@@ -41,91 +39,75 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
query => $input,
type => "intranet",
authnotrequired => 0,
- flagsrequired => { circulate => 1 },
+ flagsrequired => { circulate => "circulate_remaining_permissions" },
debug => 1,
}
);
-my $duedate;
-my $borrowernumber;
-my $itemnum;
-my $data1;
-my $data2;
-my $data3;
-my $name;
-my $phone;
-my $email;
-my $biblionumber;
-my $title;
-my $author;
-
my ( $year, $month, $day ) = Today();
my $todaysdate = sprintf("%-04.4d-%-02.2d-%02.2d", $year, $month, $day);
# Find yesterday for the default shelf pull start and end dates
# A default of the prior years's holds is a reasonable way to pull holds
my $datelastyear = sprintf("%-04.4d-%-02.2d-%02.2d", Add_Delta_YM($year, $month, $day, -1, 0));
-# Predefine the start and end dates if they are not already defined
$startdate =~ s/^\s+//;
$startdate =~ s/\s+$//;
-$enddate =~ s/^\s+//;
-$enddate =~ s/\s+$//;
-# Check if null, should string match, if so set start and end date to yesterday
-if (!defined($startdate) or $startdate eq "") {
- $startdate = format_date($datelastyear);
-}
-if (!defined($enddate) or $enddate eq "") {
- $enddate = format_date($todaysdate);
-}
-if (!defined($max_bill) or $max_bill eq "") {
- $max_bill = C4::Context->preference('noissuescharge');
- if ($max_bill <= 0) {
- $max_bill = 20.00;
- }
-}
+$enddate =~ s/^\s+//;
+$enddate =~ s/\s+$//;
+# Predefine the start and end dates if they are not already defined
+$startdate = format_date($datelastyear) unless $startdate;
+$enddate = format_date($todaysdate ) unless $enddate;
-my $dbh = C4::Context->dbh;
+my $dbh = C4::Context->dbh;
my ($sqlorderby, $sqldatewhere, $presqldatewhere) = ("","","");
-$debug and warn format_date_in_iso($startdate) . "\n" . format_date_in_iso($enddate);
+$debug and warn "start: " . format_date_in_iso($startdate) . "\nend: " . format_date_in_iso($enddate);
+my @query_params = ();
# the dates below is to check for compliance of the current date range
-#$sqldatewhere .= " AND date >= " . $dbh->quote(format_date_in_iso($startdate)) if ($startdate) ;
-$sqldatewhere .= " AND date <= " . $dbh->quote(format_date_in_iso($enddate)) if ($enddate) ;
+if ($enddate) {
+ $sqldatewhere .= " AND date <= ?";
+ push @query_params, format_date_in_iso($enddate);
+}
+push @query_params, $max_bill;
# the date below is to check for compliance of all fees prior
-$presqldatewhere .= " AND date < " . $dbh->quote(format_date_in_iso($startdate)) if ($startdate) ;
+if ($startdate) {
+ $presqldatewhere .= " AND date < ?";
+ push @query_params, format_date_in_iso($startdate);
+}
+push @query_params, $max_bill;
if ($order eq "patron") {
- $sqlorderby = " order by surname, firstname ";
+ $sqlorderby = " ORDER BY surname, firstname ";
} elsif ($order eq "fee") {
- $sqlorderby = " order by l_amountoutstanding DESC ";
+ $sqlorderby = " ORDER BY l_amountoutstanding DESC ";
} elsif ($order eq "desc") {
- $sqlorderby = " order by l_description ";
+ $sqlorderby = " ORDER BY l_description ";
} elsif ($order eq "type") {
- $sqlorderby = " order by l_accounttype ";
+ $sqlorderby = " ORDER BY l_accounttype ";
} elsif ($order eq "date") {
- $sqlorderby = " order by l_date DESC ";
+ $sqlorderby = " ORDER BY l_date DESC ";
} elsif ($order eq "total") {
- $sqlorderby = " order by sum_amount DESC ";
+ $sqlorderby = " ORDER BY sum_amount DESC ";
} else {
- $sqlorderby = " order by surname, firstname ";
+ $sqlorderby = " ORDER BY surname, firstname ";
}
my $strsth =
"SELECT
- GROUP_CONCAT(accountlines.accounttype ORDER BY accountlines.date DESC SEPARATOR '
') as l_accounttype,
- GROUP_CONCAT(description ORDER BY accountlines.date DESC SEPARATOR '
') as l_description,
- GROUP_CONCAT(round(amountoutstanding,2) ORDER BY accountlines.date DESC SEPARATOR '
') as l_amountoutstanding,
- GROUP_CONCAT(accountlines.date ORDER BY accountlines.date DESC SEPARATOR '
') as l_date,
- GROUP_CONCAT(accountlines.itemnumber ORDER BY accountlines.date DESC SEPARATOR '
') as l_itemnumber,
- count(*) as cnt,
- max(accountlines.date) as maxdate,
+ GROUP_CONCAT(accountlines.accounttype ORDER BY accountlines.date DESC SEPARATOR '
') as l_accounttype,
+ GROUP_CONCAT(description ORDER BY accountlines.date DESC SEPARATOR '
') as l_description,
+ GROUP_CONCAT(round(amountoutstanding,2) ORDER BY accountlines.date DESC SEPARATOR '
') as l_amountoutstanding,
+ GROUP_CONCAT(accountlines.date ORDER BY accountlines.date DESC SEPARATOR '
') as l_date,
+ GROUP_CONCAT(accountlines.itemnumber ORDER BY accountlines.date DESC SEPARATOR '
') as l_itemnumber,
+ count(*) as cnt,
+ max(accountlines.date) as maxdate,
round(sum(amountoutstanding),2) as sum_amount,
- borrowers.borrowernumber as borrowernumber,
- borrowers.surname as surname,
- borrowers.firstname as firstname,
- borrowers.email as email,
- borrowers.phone as phone,
+ borrowers.borrowernumber as borrowernumber,
+ borrowers.surname as surname,
+ borrowers.firstname as firstname,
+ borrowers.email as email,
+ borrowers.phone as phone,
accountlines.itemnumber,
description,
- accountlines.date as accountdate
+ accountlines.date as accountdate
FROM
borrowers, accountlines
WHERE
@@ -135,69 +117,56 @@ my $strsth =
IN (SELECT borrowernumber FROM accountlines
where borrowernumber >= 0
$sqldatewhere
- GROUP BY accountlines.borrowernumber HAVING sum(amountoutstanding) >= $max_bill )
+ GROUP BY accountlines.borrowernumber HAVING sum(amountoutstanding) >= ? )
AND accountlines.borrowernumber
NOT IN (SELECT borrowernumber FROM accountlines
where borrowernumber >= 0
$presqldatewhere
- GROUP BY accountlines.borrowernumber HAVING sum(amountoutstanding) >= $max_bill )
+ GROUP BY accountlines.borrowernumber HAVING sum(amountoutstanding) >= ? )
";
-
if (C4::Context->preference('IndependantBranches')){
$strsth .= " AND borrowers.branchcode=? ";
+ push @query_params, C4::Context->userenv->{'branch'};
}
-$strsth .= " GROUP BY accountlines.borrowernumber HAVING sum(amountoutstanding) >= $max_bill " . $sqlorderby;
+$strsth .= " GROUP BY accountlines.borrowernumber HAVING sum(amountoutstanding) >= ? " . $sqlorderby;
+push @query_params, $max_bill;
+
my $sth = $dbh->prepare($strsth);
+$sth->execute(@query_params);
-if (C4::Context->preference('IndependantBranches')){
- $sth->execute(C4::Context->userenv->{'branch'});
-}
-else {
- $sth->execute();
-}
my @billingdata;
-my $previous;
-my $this;
while ( my $data = $sth->fetchrow_hashref ) {
- my @itemlist;
- push(
- @billingdata,
- {
- l_accountype => $data->{l_accounttype},
- l_description => $data->{l_description},
- l_amountoutstanding => $data->{l_amountoutstanding},
- l_date => $data->{l_date},
- l_itemnumber => $data->{l_itemnumber},
- l_accounttype => $data->{l_accounttype},
- l_title => $data->{l_title},
- cnt => $data->{cnt},
- maxdate => $data->{maxdate},
- sum_amount => $data->{sum_amount},
- borrowernumber => $data->{borrowernumber},
- surname => $data->{surname},
- firstname => $data->{firstname},
- phone => $data->{phone},
- email => $data->{email},
- patronname => $data->{surname} . ", " . $data->{firstname} ,
- description => $data->{description},
- amountoutstanding => $data->{amountoutstanding},
- accountdata => $data->{accountdata}
- }
- );
+ push @billingdata, {
+ l_accountype => $data->{l_accounttype},
+ l_description => $data->{l_description},
+ l_amountoutstanding => $data->{l_amountoutstanding},
+ l_date => $data->{l_date},
+ l_itemnumber => $data->{l_itemnumber},
+ l_accounttype => $data->{l_accounttype},
+ l_title => $data->{l_title},
+ cnt => $data->{cnt},
+ maxdate => $data->{maxdate},
+ sum_amount => $data->{sum_amount},
+ borrowernumber => $data->{borrowernumber},
+ surname => $data->{surname},
+ firstname => $data->{firstname},
+ phone => $data->{phone},
+ email => $data->{email},
+ patronname => $data->{surname} . ", " . $data->{firstname},
+ description => $data->{description},
+ amountoutstanding => $data->{amountoutstanding},
+ accountdata => $data->{accountdata}
+ };
}
-
-$sth->finish;
-
$template->param(
todaysdate => format_date($todaysdate),
from => $startdate,
to => $enddate,
ratio => $max_bill,
billingloop => \@billingdata,
- "BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1,
- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
+ DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
);
output_html_with_http_headers $input, $cookie, $template->output;