From 960912be2c725a53d985b5451071941e4debd374 Mon Sep 17 00:00:00 2001 From: Robin Sheat Date: Wed, 13 Feb 2013 13:55:59 +1300 Subject: [PATCH] Bug 9592 - remove db-dependency from Members.pm This was causing test cases to fail on package builds, introduced in bug 7243. --- C4/Members.pm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/C4/Members.pm b/C4/Members.pm index f1136c2..5c857f6 100644 --- a/C4/Members.pm +++ b/C4/Members.pm @@ -1169,20 +1169,20 @@ Charges exempt from non-issue are: =cut -my $ACCOUNT_TYPE_LENGTH = 5; # this is plain ridiculous... - -my @not_fines = ('Res'); -push @not_fines, 'Rent' unless C4::Context->preference('RentalsInNoissuesCharge'); -unless ( C4::Context->preference('ManInvInNoissuesCharge') ) { - my $dbh = C4::Context->dbh; - my $man_inv_types = $dbh->selectcol_arrayref(qq{SELECT authorised_value FROM authorised_values WHERE category = 'MANUAL_INV'}); - push @not_fines, map substr($_, 0, $ACCOUNT_TYPE_LENGTH), @$man_inv_types; -} -my %not_fine = map {$_ => 1} @not_fines; - sub GetMemberAccountBalance { my ($borrowernumber) = @_; + my $ACCOUNT_TYPE_LENGTH = 5; # this is plain ridiculous... + + my @not_fines = ('Res'); + push @not_fines, 'Rent' unless C4::Context->preference('RentalsInNoissuesCharge'); + unless ( C4::Context->preference('ManInvInNoissuesCharge') ) { + my $dbh = C4::Context->dbh; + my $man_inv_types = $dbh->selectcol_arrayref(qq{SELECT authorised_value FROM authorised_values WHERE category = 'MANUAL_INV'}); + push @not_fines, map substr($_, 0, $ACCOUNT_TYPE_LENGTH), @$man_inv_types; + } + my %not_fine = map {$_ => 1} @not_fines; + my ($total, $acctlines) = GetMemberAccountRecords($borrowernumber); my $other_charges = 0; foreach (@$acctlines) { -- 1.7.10.4