X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_phone.cgi;h=40c8d850b90f34ff40a8bb61ca5b48e77537ef67;hb=79ae09bffa5efc73ee1195ea06f8c14d399cef36;hp=4a850c21ccd2190564c68111f4f071e7ddb19582;hpb=b65b8096089410001dfbcd35f9a56f9405b9f5f1;p=freeside.git
diff --git a/httemplate/view/svc_phone.cgi b/httemplate/view/svc_phone.cgi
index 4a850c21c..40c8d850b 100644
--- a/httemplate/view/svc_phone.cgi
+++ b/httemplate/view/svc_phone.cgi
@@ -1,10 +1,9 @@
-<% include('elements/svc_Common.html',
+<& elements/svc_Common.html,
'table' => 'svc_phone',
'fields' => \@fields,
- 'labels' => \%labels,
+ 'labels' => \%labels,
'html_foot' => $html_foot,
- )
-%>
+&>
<%init>
my $conf = new FS::Conf;
@@ -40,9 +39,9 @@ my $html_foot = sub {
###
my $e911 =
- 'E911 Information'.
+ emt('E911 Information').
&ntable("#cccccc"). '
'. ntable("#cccccc",2).
- ' |
Location | '.
+ '
'.emt('Location').' | '.
''.
$svc_phone->location_label( 'join_string' => ' ',
'double_space' => ' ',
@@ -128,6 +127,7 @@ my $html_foot = sub {
tie my %what, 'Tie::IxHash',
'pending' => 'NULL',
'billed' => 'done',
+ 'skipped' => 'failed',
;
my $number = $svc_phone->phonenum;
@@ -135,21 +135,30 @@ my $html_foot = sub {
unless $svc_phone->countrycode eq '1';
#src & charged party as per voip_cdr.pm
- my $search;
+ #XXX handle toll free too
+
+ my $search = "charged_party_or_src=";
+
my $cust_pkg = $svc_phone->cust_svc->cust_pkg;
- if ( $cust_pkg && $cust_pkg->part_pkg->option('disable_src',1) ) {
- $search = "charged_party=$number";
- } else {
- $search = "charged_party_or_src=$number";
+
+ if ( $cust_pkg ) {
+
+ #XXX handle voip_inbound too
+
+ my @part_pkg = grep { $_->plan eq 'voip_cdr' }
+ $cust_pkg->part_pkg->self_and_bill_linked;
+
+ foreach my $prefix (grep $_, map $_->option('default_prefix'), @part_pkg) {
+ $number .= ",$prefix$number";
+ }
+
+ $search = 'charged_party='
+ unless !@part_pkg || grep { ! $_->option('disable_src',1) } @part_pkg;
+
}
- #XXX default prefix as per voip_cdr.pm
- #XXX handle toll free too
+ $search .= $number;
- #my @links = map {
- # qq().
- # "View $_ CDRs";
- #} keys(%what);
my @links = map {
qq().
"View $_ CDRs";
|