Bug 29058: Add 'Always show holds' checkbox to request.pl
[koha-ffzg.git] / C4 / Accounts.pm
index e41ce79..ad0d34f 100644 (file)
@@ -18,18 +18,15 @@ package C4::Accounts;
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 
-use strict;
-#use warnings; FIXME - Bug 2505
+use Modern::Perl;
 use C4::Context;
 use C4::Stats;
 use C4::Members;
-use C4::Log qw(logaction);
 use Koha::Account;
 use Koha::Account::Lines;
 use Koha::Account::Offsets;
 use Koha::Items;
 
-use Data::Dumper qw(Dumper);
 
 use vars qw(@ISA @EXPORT);
 
@@ -37,10 +34,8 @@ BEGIN {
     require Exporter;
     @ISA    = qw(Exporter);
     @EXPORT = qw(
-      &manualinvoice
-      &getnextacctno
-      &chargelostitem
-      &purge_zero_balance_fees
+      chargelostitem
+      purge_zero_balance_fees
     );
 }
 
@@ -60,29 +55,6 @@ patron.
 
 =head1 FUNCTIONS
 
-=head2 getnextacctno
-
-  $nextacct = &getnextacctno($borrowernumber);
-
-Returns the next unused account number for the patron with the given
-borrower number.
-
-=cut
-
-#'
-# FIXME - Okay, so what does the above actually _mean_?
-sub getnextacctno {
-    my ($borrowernumber) = shift or return;
-    my $sth = C4::Context->dbh->prepare(
-        "SELECT accountno+1 FROM accountlines
-            WHERE    (borrowernumber = ?)
-            ORDER BY accountno DESC
-            LIMIT 1"
-    );
-    $sth->execute($borrowernumber);
-    return ($sth->fetchrow || 1);
-}
-
 =head2 chargelostitem
 
 In a default install of Koha the following lost values are set
@@ -95,7 +67,7 @@ FIXME : if no replacement price, borrower just doesn't get charged?
 
 =cut
 
-sub chargelostitem{
+sub chargelostitem {
     my $dbh = C4::Context->dbh();
     my ($borrowernumber, $itemnumber, $amount, $description) = @_;
     my $itype = Koha::ItemTypes->find({ itemtype => Koha::Items->find($itemnumber)->effective_itemtype() });
@@ -107,14 +79,16 @@ sub chargelostitem{
     if ($usedefaultreplacementcost && $amount == 0 && $defaultreplacecost){
         $replacementprice = $defaultreplacecost;
     }
-    # first make sure the borrower hasn't already been charged for this item
-    # FIXME this should be more exact
-    #       there is no reason a user can't lose an item, find and return it, and lost it again
-    my $existing_charges = Koha::Account::Lines->search(
+    my $checkout = Koha::Checkouts->find({ itemnumber => $itemnumber });
+    my $issue_id = $checkout ? $checkout->issue_id : undef;
+
+    my $account = Koha::Account->new({ patron_id => $borrowernumber });
+    # first make sure the borrower hasn't already been charged for this item (for this issuance)
+    my $existing_charges = $account->lines->search(
         {
-            borrowernumber => $borrowernumber,
-            itemnumber     => $itemnumber,
-            accounttype    => 'L',
+            itemnumber      => $itemnumber,
+            debit_type_code => 'LOST',
+            issue_id        => $issue_id
         }
     )->count();
 
@@ -122,160 +96,37 @@ sub chargelostitem{
     unless ($existing_charges) {
         #add processing fee
         if ($processfee && $processfee > 0){
-            my $accountline = Koha::Account::Line->new(
-                {
-                    borrowernumber    => $borrowernumber,
-                    accountno         => getnextacctno($borrowernumber),
-                    date              => \'NOW()',
-                    amount            => $processfee,
-                    description       => $description,
-                    accounttype       => 'PF',
-                    amountoutstanding => $processfee,
-                    itemnumber        => $itemnumber,
-                    note              => $processingfeenote,
-                    manager_id        => C4::Context->userenv ? C4::Context->userenv->{'number'} : 0,
-                }
-            )->store();
-
-            my $account_offset = Koha::Account::Offset->new(
+            my $accountline = $account->add_debit(
                 {
-                    debit_id => $accountline->id,
-                    type     => 'Processing Fee',
-                    amount   => $accountline->amount,
+                    amount      => $processfee,
+                    description => $description,
+                    note        => $processingfeenote,
+                    user_id     => C4::Context->userenv ? C4::Context->userenv->{'number'} : undef,
+                    interface   => C4::Context->interface,
+                    library_id  => C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef,
+                    type        => 'PROCESSING',
+                    item_id     => $itemnumber,
+                    issue_id    => $issue_id,
                 }
-            )->store();
-
-            if ( C4::Context->preference("FinesLog") ) {
-                logaction("FINES", 'CREATE',$borrowernumber,Dumper({
-                    action            => 'create_fee',
-                    borrowernumber    => $accountline->borrowernumber,,
-                    accountno         => $accountline->accountno,
-                    amount            => $accountline->amount,
-                    description       => $accountline->description,
-                    accounttype       => $accountline->accounttype,
-                    amountoutstanding => $accountline->amountoutstanding,
-                    note              => $accountline->note,
-                    itemnumber        => $accountline->itemnumber,
-                    manager_id        => $accountline->manager_id,
-                }));
-            }
+            );
         }
         #add replace cost
         if ($replacementprice > 0){
-            my $accountline = Koha::Account::Line->new(
+            my $accountline = $account->add_debit(
                 {
-                    borrowernumber    => $borrowernumber,
-                    accountno         => getnextacctno($borrowernumber),
-                    date              => \'NOW()',
-                    amount            => $replacementprice,
-                    description       => $description,
-                    accounttype       => 'L',
-                    amountoutstanding => $replacementprice,
-                    itemnumber        => $itemnumber,
-                    manager_id        => C4::Context->userenv ? C4::Context->userenv->{'number'} : 0,
+                    amount      => $replacementprice,
+                    description => $description,
+                    note        => undef,
+                    user_id     => C4::Context->userenv ? C4::Context->userenv->{'number'} : undef,
+                    interface   => C4::Context->interface,
+                    library_id  => C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef,
+                    type        => 'LOST',
+                    item_id     => $itemnumber,
+                    issue_id    => $issue_id,
                 }
-            )->store();
-
-            my $account_offset = Koha::Account::Offset->new(
-                {
-                    debit_id => $accountline->id,
-                    type     => 'Lost Item',
-                    amount   => $accountline->amount,
-                }
-            )->store();
-
-            if ( C4::Context->preference("FinesLog") ) {
-                logaction("FINES", 'CREATE',$borrowernumber,Dumper({
-                    action            => 'create_fee',
-                    borrowernumber    => $accountline->borrowernumber,,
-                    accountno         => $accountline->accountno,
-                    amount            => $accountline->amount,
-                    description       => $accountline->description,
-                    accounttype       => $accountline->accounttype,
-                    amountoutstanding => $accountline->amountoutstanding,
-                    note              => $accountline->note,
-                    itemnumber        => $accountline->itemnumber,
-                    manager_id        => $accountline->manager_id,
-                }));
-            }
-        }
-    }
-}
-
-=head2 manualinvoice
-
-  &manualinvoice($borrowernumber, $itemnumber, $description, $type,
-                 $amount, $note);
-
-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: In Koha 3.0 , the only account adjustment 'types' passed to this function
-# are:
-#              'C' = CREDIT
-#              'FOR' = FORGIVEN  (Formerly 'F', but 'F' is taken to mean 'FINE' elsewhere)
-#              'N' = New Card fee
-#              'F' = Fine
-#              'A' = Account Management fee
-#              'M' = Sundry
-#              'L' = Lost Item
-#
-
-sub manualinvoice {
-    my ( $borrowernumber, $itemnum, $desc, $type, $amount, $note ) = @_;
-    my $manager_id = 0;
-    $manager_id = C4::Context->userenv->{'number'} if C4::Context->userenv;
-    my $dbh      = C4::Context->dbh;
-    my $insert;
-    my $accountno  = getnextacctno($borrowernumber);
-    my $amountleft = $amount;
-
-    my $accountline = Koha::Account::Line->new(
-        {
-            borrowernumber    => $borrowernumber,
-            accountno         => $accountno,
-            date              => \'NOW()',
-            amount            => $amount,
-            description       => $desc,
-            accounttype       => $type,
-            amountoutstanding => $amountleft,
-            itemnumber        => $itemnum || undef,
-            note              => $note,
-            manager_id        => $manager_id,
+            );
         }
-    )->store();
-
-    my $account_offset = Koha::Account::Offset->new(
-        {
-            debit_id => $accountline->id,
-            type     => 'Manual Debit',
-            amount   => $amount,
-        }
-    )->store();
-
-    if ( C4::Context->preference("FinesLog") ) {
-        logaction("FINES", 'CREATE',$borrowernumber,Dumper({
-            action            => 'create_fee',
-            borrowernumber    => $borrowernumber,
-            accountno         => $accountno,
-            amount            => $amount,
-            description       => $desc,
-            accounttype       => $type,
-            amountoutstanding => $amountleft,
-            note              => $note,
-            itemnumber        => $itemnum,
-            manager_id        => $manager_id,
-        }));
     }
-
-    return 0;
 }
 
 =head2 purge_zero_balance_fees