use strict;
require Exporter;
-use DBI;
use C4::Context;
use C4::Stats;
use C4::Search;
use C4::Circulation::Circ2;
+use C4::Members;
use vars qw($VERSION @ISA @EXPORT);
# set the version for version checking
=cut
@ISA = qw(Exporter);
-@EXPORT = qw(&recordpayment &fixaccounts &makepayment &manualinvoice
-&getnextacctno);
+@EXPORT = qw(&checkaccount &recordpayment &fixaccounts &makepayment &manualinvoice
+ &getnextacctno &manualcredit
+
+ &dailyAccountBalance &addDailyAccountOp &getDailyAccountOp);
-# FIXME - Never used
-sub displayaccounts{
- my ($env)=@_;
+=item checkaccount
+
+ $owed = &checkaccount($env, $borrowernumber, $dbh, $date);
+
+Looks up the total amount of money owed by a borrower (fines, etc.).
+
+C<$borrowernumber> specifies the borrower to look up.
+
+C<$dbh> is a DBI::db handle for the Koha database.
+
+C<$env> is ignored.
+
+=cut
+#'
+sub checkaccount {
+ #take borrower number
+ #check accounts and list amounts owing
+ my ($env,$bornumber,$dbh,$date)=@_;
+ my $select="SELECT SUM(amountoutstanding) AS total
+ FROM accountlines
+ WHERE borrowernumber = ?
+ AND amountoutstanding<>0";
+ my @bind = ($bornumber);
+ if ($date ne ''){
+ $select.=" AND date < ?";
+ push(@bind,$date);
+ }
+ # print $select;
+ my $sth=$dbh->prepare($select);
+ $sth->execute(@bind);
+ my $data=$sth->fetchrow_hashref;
+ my $total = $data->{'total'};
+ $sth->finish;
+ # output(1,2,"borrower owes $total");
+ #if ($total > 0){
+ # # output(1,2,"borrower owes $total");
+ # if ($total > 5){
+ # reconcileaccount($env,$dbh,$bornumber,$total);
+ # }
+ #}
+ # pause();
+ return($total);
}
=item recordpayment
$newamtos = $accdata->{'amountoutstanding'} - $amountleft;
$amountleft = 0;
}
- my $thisacct = $accdata->{accountno};
+ my $thisacct = $accdata->{accountid};
my $usth = $dbh->prepare("update accountlines set amountoutstanding= ?
- where (borrowernumber = ?) and (accountno=?)");
- $usth->execute($newamtos,$bornumber,$thisacct);
- $usth->finish;
- $usth = $dbh->prepare("insert into accountoffsets
- (borrowernumber, accountno, offsetaccount, offsetamount)
- values (?,?,?,?)");
- $usth->execute($bornumber,$accdata->{'accountno'},$nextaccntno,$newamtos);
+ where accountid=?");
+ $usth->execute($newamtos,$thisacct);
$usth->finish;
}
# create new line
values (?,?,now(),?,'Payment,thanks','Pay',?)");
$usth->execute($bornumber,$nextaccntno,0-$data,0-$amountleft);
$usth->finish;
- UpdateStats($env,$branch,'payment',$data,'','','',$bornumber);
+# UpdateStats($env,$branch,'payment',$data,'','','',$bornumber);
$sth->finish;
}
&makepayment($borrowernumber, $acctnumber, $amount, $branchcode);
-Records the fact that a patron has paid off the entire amount he or
+Records the fact that a patron has paid off the an amount he or
she owes.
C<$borrowernumber> is the patron's borrower number. C<$acctnumber> is
the account that was credited. C<$amount> is the amount paid (this is
-only used to record the payment. It is assumed to be equal to the
-amount owed). C<$branchcode> is the code of the branch where payment
+only used to record the payment. C<$branchcode> is the code of the branch where payment
was made.
=cut
#'
# FIXME - I'm not at all sure about the above, because I don't
# understand what the acct* tables in the Koha database are for.
+
sub makepayment{
- #here we update both the accountoffsets and the account lines
+ #here we update the account lines
#updated to check, if they are paying off a lost item, we return the item
# from their card, and put a note on the item record
- my ($bornumber,$accountno,$amount,$user)=@_;
+ my ($bornumber,$accountno,$amount,$user,$type)=@_;
my $env;
+my $desc;
+my $pay;
+if ($type eq "Pay"){
+ $desc="Payment,received by -". $user;
+ $pay="Pay";
+}else{
+ $desc="Written-off -by". $user;
+ $pay="W";
+}
my $dbh = C4::Context->dbh;
# begin transaction
my $nextaccntno = getnextacctno($env,$bornumber,$dbh);
$dbh->do(<<EOT);
UPDATE accountlines
- SET amountoutstanding = 0
+ SET amountoutstanding = amountoutstanding-$amount
WHERE borrowernumber = $bornumber
AND accountno = $accountno
EOT
-# print $updquery;
- $dbh->do(<<EOT);
- INSERT INTO accountoffsets
- (borrowernumber, accountno, offsetaccount,
- offsetamount)
- VALUES ($bornumber, $accountno, $nextaccntno, $newamtos)
-EOT
+
# create new line
my $payment=0-$amount;
+if ($data->{'itemnumber'}){
+$desc.=" ".$data->{'itemnumber'};
+
$dbh->do(<<EOT);
INSERT INTO accountlines
+ (borrowernumber, accountno, itemnumber,date, amount,
+ description, accounttype, amountoutstanding,offset)
+ VALUES ($bornumber, $nextaccntno, $data->{'itemnumber'},now(), $payment,
+ '$desc', '$pay', 0,$accountno)
+EOT
+}else{
+ $dbh->do(<<EOT);
+INSERT INTO accountlines
(borrowernumber, accountno, date, amount,
- description, accounttype, amountoutstanding)
+ description, accounttype, amountoutstanding,offset)
VALUES ($bornumber, $nextaccntno, now(), $payment,
- 'Payment,thanks - $user', 'Pay', 0)
+ '$desc', '$pay', 0,$accountno)
EOT
+}
# FIXME - The second argument to &UpdateStats is supposed to be the
# branch code.
- UpdateStats($env,$user,'payment',$amount,'','','',$bornumber);
+# UpdateStats($env,'MAIN',$pay,$amount,'','','',$bornumber);
$sth->finish;
#check to see what accounttype
if ($data->{'accounttype'} eq 'Rep' || $data->{'accounttype'} eq 'L'){
=cut
#'
-# FIXME - I don't understand what this function does.
+# FIXME - I don't know whether used
sub fixaccounts {
my ($borrowernumber,$accountno,$amount)=@_;
my $dbh = C4::Context->dbh;
sub returnlost{
my ($borrnum,$itemnum)=@_;
my $dbh = C4::Context->dbh;
- my $borrower=borrdata('',$borrnum); #from C4::Search;
+ my $borrower=C4::Members::borrdata('',$borrnum); #from C4::Members;
my $sth=$dbh->prepare("Update issues set returndate=now() where
borrowernumber=? and itemnumber=? and returndate is null");
$sth->execute($borrnum,$itemnum);
$sth->finish;
- my @datearr = localtime(time);
- my $date = (1900+$datearr[5])."-".($datearr[4]+1)."-".$datearr[3];
- my $bor="$borrower->{'firstname'} $borrower->{'surname'} $borrower->{'cardnumber'}";
- $sth=$dbh->prepare("Update items set paidfor=? where itemnumber=?");
- $sth->execute("Paid for by $bor $date",$itemnum);
- $sth->finish;
}
=item manualinvoice
- &manualinvoice($borrowernumber, $itemnumber, $description, $type,
+ &manualinvoice($borrowernumber, $description, $type,
$amount, $user);
C<$borrowernumber> is the patron's borrower number.
C<$description> is a description of the transaction.
C<$type> may be one of C<CS>, C<CB>, C<CW>, C<CF>, C<CL>, C<N>, C<L>,
or C<REF>.
-C<$itemnumber> is the item involved, if pertinent; otherwise, it
-should be the empty string.
+
=cut
#'
-# FIXME - Okay, so what does this function do, really?
+
sub manualinvoice{
- my ($bornum,$itemnum,$desc,$type,$amount,$user)=@_;
+ my ($bornum,$desc,$type,$amount,$user)=@_;
my $dbh = C4::Context->dbh;
my $insert;
- $itemnum=~ s/ //g;
my %env;
my $accountno=getnextacctno('',$bornum,$dbh);
my $amountleft=$amount;
- if ($type eq 'CS' || $type eq 'CB' || $type eq 'CW'
- || $type eq 'CF' || $type eq 'CL'){
- my $amount2=$amount*-1; # FIXME - $amount2 = -$amount
- $amountleft=fixcredit(\%env,$bornum,$amount2,$itemnum,$type,$user);
- }
+
if ($type eq 'N'){
$desc.="New Card";
}
+
if ($type eq 'L' && $desc eq ''){
$desc="Lost Item";
}
- if ($type eq 'REF'){
- $amountleft=refund('',$bornum,$amount);
+ if ($type eq 'REF'){
+ $desc="Cash refund";
}
- if ($itemnum ne ''){
- $desc.=" ".$itemnum;
- my $sth=$dbh->prepare("INSERT INTO accountlines
- (borrowernumber, accountno, date, amount, description, accounttype, amountoutstanding, itemnumber)
- VALUES (?, ?, now(), ?,?, ?,?,?)");
-# $sth->execute($bornum, $accountno, $amount, $desc, $type, $amountleft, $data->{'itemnumber'});
- $sth->execute($bornum, $accountno, $amount, $desc, $type, $amountleft, $itemnum);
- } else {
+ $amountleft=refund('',$bornum,$amount);
my $sth=$dbh->prepare("INSERT INTO accountlines
(borrowernumber, accountno, date, amount, description, accounttype, amountoutstanding)
VALUES (?, ?, now(), ?, ?, ?, ?)");
$sth->execute($bornum, $accountno, $amount, $desc, $type, $amountleft);
- }
+
}
+sub manualcredit{
+ my ($bornum,$accountid,$desc,$type,$amount,$user,$oldaccount)=@_;
+ my $dbh = C4::Context->dbh;
+ my $insert;
+ my $accountno=getnextacctno('',$bornum,$dbh);
+# my $amountleft=$amount;
+my $amountleft;
+my $noerror;
+ if ($type eq 'CN' || $type eq 'CA' || $type eq 'CR'
+ || $type eq 'CF' || $type eq 'CL' || $type eq 'CM'){
+ my $amount2=$amount*-1;
+ ( $amountleft, $noerror,$oldaccount)=fixcredit($dbh,$bornum,$amount2,$accountid,$type,$user);
+ }
+ if ($noerror>0){
+
+## find the accountline desc
+my $sth2=$dbh->prepare("select description from accountlines where accountid=?");
+$sth2->execute($accountid);
+my $desc2=$sth2->fetchrow;
+$desc.=" Credited for ".$desc2." by ".$user;
+$sth2->finish;
+
+ my $sth=$dbh->prepare("INSERT INTO accountlines
+ (borrowernumber, accountno, date, amount, description, accounttype, amountoutstanding,offset)
+ VALUES (?, ?, now(), ?, ?, ?, ?,?)");
+ $sth->execute($bornum, $accountno, $amount, $desc, $type, $amountleft,$oldaccount);
+
+return ("0");
+} else {
+ return("1");
+}
+}
# fixcredit
-# $amountleft = &fixcredit($env, $bornumber, $data, $barcode, $type, $user);
-#
-# This function is only used internally.
-# FIXME - Figure out what this function does, and write it down.
sub fixcredit{
#here we update both the accountoffsets and the account lines
- my ($env,$bornumber,$data,$barcode,$type,$user)=@_;
- my $dbh = C4::Context->dbh;
+ my ($dbh,$bornumber,$data,$accountid,$type,$user)=@_;
my $newamtos = 0;
my $accdata = "";
my $amountleft = $data;
- if ($barcode ne ''){
- my $item=getiteminformation($env,'',$barcode);
- my $nextaccntno = getnextacctno($env,$bornumber,$dbh);
- my $query="Select * from accountlines where (borrowernumber=?
- and itemnumber=? and amountoutstanding > 0)";
- if ($type eq 'CL'){
- $query.=" and (accounttype = 'L' or accounttype = 'Rep')";
- } elsif ($type eq 'CF'){
- $query.=" and (accounttype = 'F' or accounttype = 'FU' or
- accounttype='Res' or accounttype='Rent')";
- } elsif ($type eq 'CB'){
- $query.=" and accounttype='A'";
- }
-# print $query;
- my $sth=$dbh->prepare($query);
- $sth->execute($bornumber,$item->{'itemnumber'});
+ my $env;
+ my $query="Select * from accountlines where accountid=? and amountoutstanding > 0";
+ my $sth=$dbh->prepare($query);
+$sth->execute($accountid);
$accdata=$sth->fetchrow_hashref;
$sth->finish;
- if ($accdata->{'amountoutstanding'} < $amountleft) {
- $newamtos = 0;
- $amountleft -= $accdata->{'amountoutstanding'};
- } else {
- $newamtos = $accdata->{'amountoutstanding'} - $amountleft;
+
+if ($accdata){
+ if ($accdata->{'amountoutstanding'} < $amountleft) {
+ $newamtos = 0;
+ $amountleft -= $accdata->{'amountoutstanding'};
+ } else {
+ $newamtos = $accdata->{'amountoutstanding'} - $amountleft;
$amountleft = 0;
- }
- my $thisacct = $accdata->{accountno};
+ }
+ my $thisacct = $accdata->{accountid};
my $usth = $dbh->prepare("update accountlines set amountoutstanding= ?
- where (borrowernumber = ?) and (accountno=?)");
- $usth->execute($newamtos,$bornumber,$thisacct);
- $usth->finish;
- $usth = $dbh->prepare("insert into accountoffsets
- (borrowernumber, accountno, offsetaccount, offsetamount)
- values (?,?,?,?)");
- $usth->execute($bornumber,$accdata->{'accountno'},$nextaccntno,$newamtos);
+ where accountid=?");
+ $usth->execute($newamtos,$thisacct);
$usth->finish;
- }
+
# begin transaction
- my $nextaccntno = getnextacctno($env,$bornumber,$dbh);
# get lines with outstanding amounts to offset
my $sth = $dbh->prepare("select * from accountlines
where (borrowernumber = ?) and (amountoutstanding >0)
# print $query;
# offset transactions
while (($accdata=$sth->fetchrow_hashref) and ($amountleft>0)){
- if ($accdata->{'amountoutstanding'} < $amountleft) {
- $newamtos = 0;
- $amountleft -= $accdata->{'amountoutstanding'};
- } else {
- $newamtos = $accdata->{'amountoutstanding'} - $amountleft;
+ if ($accdata->{'amountoutstanding'} < $amountleft) {
+ $newamtos = 0;
+ $amountleft -= $accdata->{'amountoutstanding'};
+ } else {
+ $newamtos = $accdata->{'amountoutstanding'} - $amountleft;
$amountleft = 0;
- }
- my $thisacct = $accdata->{accountno};
+ }
+ my $thisacct = $accdata->{accountid};
my $usth = $dbh->prepare("update accountlines set amountoutstanding= ?
- where (borrowernumber = ?) and (accountno=?)");
- $usth->execute($newamtos,$bornumber,$thisacct);
- $usth->finish;
- $usth = $dbh->prepare("insert into accountoffsets
- (borrowernumber, accountno, offsetaccount, offsetamount)
- values (?,?,?,?)");
- $usth->execute($bornumber,$accdata->{'accountno'},$nextaccntno,$newamtos);
+ where accountid=?");
+ $usth->execute($newamtos,$thisacct);
$usth->finish;
- }
+ }## while account
$sth->finish;
- $env->{'branch'}=$user;
- $type="Credit ".$type;
- UpdateStats($env,$user,$type,$data,$user,'','',$bornumber);
- $amountleft*=-1;
- return($amountleft);
+ $amountleft*=-1;
+ return($amountleft,1,$accdata->{'accountno'});
+}else{
+return("",0);
+}
}
-# FIXME - Figure out what this function does, and write it down.
+
+#
sub refund{
#here we update both the accountoffsets and the account lines
my ($env,$bornumber,$data)=@_;
my $amountleft = $data *-1;
# begin transaction
- my $nextaccntno = getnextacctno($env,$bornumber,$dbh);
# get lines with outstanding amounts to offset
my $sth = $dbh->prepare("select * from accountlines
where (borrowernumber = ?) and (amountoutstanding<0)
$amountleft = 0;
}
# print $amountleft;
- my $thisacct = $accdata->{accountno};
+ my $thisacct = $accdata->{accountid};
my $usth = $dbh->prepare("update accountlines set amountoutstanding= ?
- where (borrowernumber = ?) and (accountno=?)");
- $usth->execute($newamtos,$bornumber,$thisacct);
- $usth->finish;
- $usth = $dbh->prepare("insert into accountoffsets
- (borrowernumber, accountno, offsetaccount, offsetamount)
- values (?,?,?,?)");
- $usth->execute($bornumber,$accdata->{'accountno'},$nextaccntno,$newamtos);
+ where accountid=?");
+ $usth->execute($newamtos,$thisacct);
$usth->finish;
+
}
$sth->finish;
- return($amountleft);
+ return($amountleft*-1);
+}
+
+#Funtion to manage the daily account#
+
+sub dailyAccountBalance {
+ my ($date) = @_;
+ my $dbh = C4::Context->dbh;
+ my $sth;
+
+ if ($date) {
+
+ $sth = $dbh->prepare("SELECT * FROM dailyaccountbalance WHERE balanceDate = ?");
+ $sth->execute($date);
+ my $data = $sth->fetchrow_hashref;
+ if (!$data->{'balanceDate'}) {
+ $data->{'noentry'} = 1;
+ }
+ return ($data);
+
+ } else {
+
+ $sth = $dbh->prepare("SELECT * FROM dailyaccountbalance WHERE balanceDate = CURRENT_DATE()");
+ $sth->execute();
+
+ if ($sth->rows) {
+ return ($sth->fetchrow_hashref);
+ } else {
+ my %hash;
+
+ $sth = $dbh->prepare("SELECT currentBalanceInHand FROM dailyaccountbalance ORDER BY balanceDate DESC LIMIT 1");
+ $sth->execute();
+ if ($sth->rows) {
+ ($hash{'initialBalanceInHand'}) = $sth->fetchrow_array;
+ $hash{'currentBalanceInHand'} = $hash{'initialBalanceInHand'};
+ } else {
+ $hash{'initialBalanceInHand'} = 0;
+ $hash{'currentBalanceInHand'} = 0;
+ }
+ #gets the current date.
+ my @nowarr = localtime();
+ my $date = (1900+$nowarr[5])."-".($nowarr[4]+1)."-".$nowarr[3];
+
+ $hash{'balanceDate'} = $date;
+ $hash{'initialBalanceInHand'} = sprintf ("%.2f", $hash{'initialBalanceInHand'});
+ $hash{'currentBalanceInHand'} = sprintf ("%.2f", $hash{'currentBalanceInHand'});
+ return \%hash;
+ }
+
+ }
+}
+
+sub addDailyAccountOp {
+ my ($description, $amount, $type, $invoice) = @_;
+ my $dbh = C4::Context->dbh;
+ unless ($invoice) { $invoice = undef};
+ my $sth = $dbh->prepare("INSERT INTO dailyaccount (date, description, amount, type, invoice) VALUES (CURRENT_DATE(), ?, ?, ?, ?)");
+ $sth->execute($description, $amount, $type, $invoice);
+ my $accountop = $dbh->{'mysql_insertid'};
+ $sth = $dbh->prepare("SELECT * FROM dailyaccountbalance WHERE balanceDate = CURRENT_DATE()");
+ $sth->execute();
+ if (!$sth->rows) {
+ $sth = $dbh->prepare("SELECT currentBalanceInHand FROM dailyaccountbalance ORDER BY balanceDate DESC LIMIT 1");
+ $sth->execute();
+ my ($blc) = $sth->fetchrow_array;
+ unless ($blc) {$blc = 0}
+ $sth = $dbh->prepare("INSERT INTO dailyaccountbalance (balanceDate, initialBalanceInHand, currentBalanceInHand) VALUES (CURRENT_DATE(), ?, ?)");
+ $sth->execute($blc, $blc);
+ }
+ if ($type eq 'D') {
+ $amount = -1 * $amount;
+ }
+ $sth = $dbh->prepare("UPDATE dailyaccountbalance SET currentBalanceInHand = currentBalanceInHand + ? WHERE balanceDate = CURRENT_DATE()");
+ $sth->execute($amount);
+ return $accountop;
+}
+
+sub getDailyAccountOp {
+ my ($date) = @_;
+ my $dbh = C4::Context->dbh;
+ my $sth;
+ if ($date) {
+ $sth = $dbh->prepare("SELECT * FROM dailyaccount WHERE date = ?");
+ $sth->execute($date);
+ } else {
+ $sth = $dbh->prepare("SELECT * FROM dailyaccount WHERE date = CURRENT_DATE()");
+ $sth->execute();
+ }
+ my @operations;
+ my $count = 1;
+ while (my $row = $sth->fetchrow_hashref) {
+ $row->{'num'} = $count++;
+ $row->{$row->{'type'}} = 1;
+
+ $row->{'invoice'} =~ /(\w*)\-(\w*)\-(\w*)/;
+ $row->{'invoiceNumber'} = $1;
+ $row->{'invoiceSupplier'} = $2;
+ $row->{'invoiceType'} = $3;
+
+ push @operations, $row;
+ }
+ return (scalar(@operations), \@operations);
}
END { } # module clean-up code here (global destructor)
projects / koha-ffzg.git / blobdiff