X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_phone.cgi;h=ab69c4f6ff692e8ecffe01834970e43344698a9a;hb=1598480a192e9a056834d636fbd7de7ae00dead6;hp=ffb6fcc4aac2c859d4feb5b35720e8fa06b0dbbe;hpb=a9916ce48023939ab1d2506704f5545eb183a2ea;p=freeside.git
diff --git a/httemplate/view/svc_phone.cgi b/httemplate/view/svc_phone.cgi
index ffb6fcc4a..ab69c4f6f 100644
--- a/httemplate/view/svc_phone.cgi
+++ b/httemplate/view/svc_phone.cgi
@@ -1,7 +1,7 @@
<& elements/svc_Common.html,
'table' => 'svc_phone',
'fields' => \@fields,
- 'labels' => \%labels,
+ 'labels' => \%labels,
'html_foot' => $html_foot,
&>
<%init>
@@ -16,21 +16,51 @@ my %labels = map { $_ => ( ref($fields->{$_})
);
} keys %$fields;
-my @fields = qw( countrycode phonenum );
+my @fields = qw( countrycode phonenum sim_imsi );
push @fields, 'domain' if $conf->exists('svc_phone-domain');
-push @fields, qw( pbx_title sip_password pin phone_name forwarddst email );
+push @fields, qw( pbx_title );
+$labels{pbx_title} = 'PBX';
+
+if ( $conf->exists('showpasswords') ) {
+ push @fields, qw( sip_password );
+} else {
+ push @fields, { 'field' => 'sip_password', #'_HIDDEN_sip_password',
+ 'type' => 'fixed',
+ 'value' => '('. mt('hidden') .')',
+ };
+}
+
+push @fields, qw( pin phone_name forwarddst email );
+
+push @fields, { field => 'sms_carrierid',
+ #type=>'cdr_carrier',
+ value_callback => sub {
+ $_[0]->sms_carriername,
+ },
+ },
+ 'sms_account',
+ 'max_simultaneous',
+;
if ( $conf->exists('svc_phone-lnp') ) {
-push @fields, 'lnp_status',
- 'lnp_reject_reason',
- { field => 'portable', type => 'checkbox', },
- 'lrn',
- { field => 'lnp_desired_due_date', type => 'date', },
- { field => 'lnp_due_date', type => 'date', },
- 'lnp_other_provider',
- 'lnp_other_provider_account';
+ push @fields, 'lnp_status',
+ 'lnp_reject_reason',
+ { field => 'portable', type => 'checkbox', },
+ 'lrn',
+ { field => 'lnp_desired_due_date', type => 'date', },
+ { field => 'lnp_due_date', type => 'date', },
+ 'lnp_other_provider',
+ 'lnp_other_provider_account',
+ ;
}
+$labels{circuit_label} = mt('Circuit');
+push @fields, { field => 'circuit_label',
+ link => [ $p.'view/svc_circuit.cgi?', 'circuit_svcnum' ]
+ };
+
+push @fields, 'sip_server';
+
my $html_foot = sub {
my $svc_phone = shift;
@@ -56,69 +86,13 @@ my $html_foot = sub {
###
# Devices
###
+ #remove this when svc_phone isa device_Common, as elements/svc_Common will display it
+ my $devices = include('/view/elements/svc_devices.html',
+ 'svc_x' => $svc_phone,
+ 'table' => 'phone_device',
+ );
- my $devices = '';
-
- my $sth = dbh->prepare("SELECT COUNT(*) FROM part_device") #WHERE disabled = '' OR disabled IS NULL;");
- or die dbh->errstr;
- $sth->execute or die $sth->errstr;
- my $num_part_device = $sth->fetchrow_arrayref->[0];
-
- my @phone_device = $svc_phone->phone_device;
- if ( @phone_device || $num_part_device ) {
- my $svcnum = $svc_phone->svcnum;
- $devices .=
- qq[Devices (Add device)
];
- if ( @phone_device ) {
-
- $devices .= qq!
-
- !;
-
-
- $devices .=
- include('/elements/table-grid.html').
- '