Bug 17586: Move ->get_balance to Koha::Account->balance

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

diff --git a/Koha/Account.pm b/Koha/Account.pm
index 93b9f62..7041cb2 100644 (file)
--- a/Koha/Account.pm
+++ b/Koha/Account.pm
@@ -223,6 +223,30 @@ sub pay {
     return $payment->id;
 }
 
+=head3 balance
+
+my $balance = $self->balance
+
+Return the balance (sum of amountoutstanding columns)
+
+=cut
+
+sub balance {
+    my ($self) = @_;
+    my $fines = Koha::Account::Lines->search(
+        {
+            borrowernumber => $self->{patron_id},
+        },
+        {
+            select => [ { sum => 'amountoutstanding' } ],
+            as => ['total_amountoutstanding'],
+        }
+    );
+    return $fines->count
+      ? $fines->next->get_column('total_amountoutstanding')
+      : 0;
+}
+
 1;
 
 =head1 AUTHOR

diff --git a/Koha/Account/Lines.pm b/Koha/Account/Lines.pm
index aa54e0c..0e0677c 100644 (file)
--- a/Koha/Account/Lines.pm
+++ b/Koha/Account/Lines.pm
@@ -36,26 +36,6 @@ Koha::Account::Lines - Koha Account Line Object set class
 
 =cut
 
-=head3 get_balance
-
-my $balance = $self->get_balance
-
-Return the balance (sum of amountoutstanding columns)
-
-=cut
-
-sub get_balance {
-    my ($self) = @_;
-    my $fines = $self->search(
-        {},
-        {
-            select => [ { sum => 'amountoutstanding' } ],
-            as => ['total_amountoutstanding']
-        }
-    );
-    return $fines->count ? $fines->next->get_column('total_amountoutstanding') : 0;
-}
-
 =head3 type
 
 =cut

diff --git a/t/db_dependent/Accounts.t b/t/db_dependent/Accounts.t
index f9d1d80..a2a96b2 100644 (file)
--- a/t/db_dependent/Accounts.t
+++ b/t/db_dependent/Accounts.t
@@ -365,13 +365,13 @@ subtest "makepartialpayment() tests" => sub {
     }
 };
 
-subtest 'get_balance' => sub {
+subtest 'balance' => sub {
     plan tests => 2;
 
     my $patron = $builder->build({source => 'Borrower'});
     $patron = Koha::Patrons->find( $patron->{borrowernumber} );
-    my $account_lines = $patron->get_account_lines;
-    is( $account_lines->get_balance, 0, 'get_balance should return 0 if the patron does not have fines' );
+    my $account = $patron->account;
+    is( $account->balance, 0, 'balance should return 0 if the patron does not have fines' );
 
     my $accountline_1 = $builder->build(
         {
@@ -394,8 +394,8 @@ subtest 'get_balance' => sub {
         }
     );
 
-    my $balance = $patron->get_account_lines->get_balance;
-    is( int($balance), 29, 'get_balance should return the correct value');
+    my $balance = $patron->account->balance;
+    is( int($balance), 29, 'balance should return the correct value');
 
     $patron->delete;
 };