From b9acb8cd60df0bd33924780f4a0f05fd5e2d4394 Mon Sep 17 00:00:00 2001 From: Daniel Tiefnig Date: Sat, 5 Nov 2011 01:10:09 +0000 Subject: [PATCH] removed unnecessary use of session for admin::Utils::prepare_call_list fixes issue #765 --- lib/admin/Controller/subscriber.pm | 5 +++-- lib/admin/Utils.pm | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/admin/Controller/subscriber.pm b/lib/admin/Controller/subscriber.pm index 94535cb..4363207 100644 --- a/lib/admin/Controller/subscriber.pm +++ b/lib/admin/Controller/subscriber.pm @@ -1177,14 +1177,15 @@ sub call_data : Local { { id => $$subscriber{account_id} }, \$account ); + my $bilprof = {}; if(eval { defined $$account{billing_profile} }) { return 1 unless $c->model('Provisioning')->call_prov($c, 'billing', 'get_billing_profile', { handle => $$account{billing_profile} }, - \$c->session->{voip_account}{billing_profile} + \$bilprof ); } - $c->stash->{call_list} = admin::Utils::prepare_call_list($c, $calls, $listfilter); + $c->stash->{call_list} = admin::Utils::prepare_call_list($c, $calls, $listfilter, $bilprof); $c->stash->{subscriber}{list_filter} = $listfilter if defined $listfilter; undef $c->stash->{call_list} unless eval { @{$c->stash->{call_list}} }; diff --git a/lib/admin/Utils.pm b/lib/admin/Utils.pm index aeaa26c..b29f222 100644 --- a/lib/admin/Utils.pm +++ b/lib/admin/Utils.pm @@ -128,7 +128,7 @@ sub get_qualified_number_for_subscriber { # as returned by the prov. interface and returns a reference to an # array suited for TT display sub prepare_call_list { - my ($c, $call_list, $filter) = @_; + my ($c, $call_list, $filter, $bilprof) = @_; my $callentries = []; my @time = localtime time; @@ -167,7 +167,7 @@ sub prepare_call_list { if(defined $$call{call_fee}) { # money is allways returned as cents - $callentry{call_fee} = sprintf $c->session->{voip_account}{billing_profile}{data}{currency} . " %.04f", $$call{call_fee}/100; + $callentry{call_fee} = sprintf $$bilprof{data}{currency} . " %.04f", $$call{call_fee}/100; } else { $callentry{call_fee} = ''; }