[freeside-commits] freeside/httemplate/view svc_acct.cgi, 1.63, 1.64 svc_broadband.cgi, 1.19, 1.20 svc_dish.cgi, NONE, 1.1 svc_hardware.cgi, NONE, 1.1 svc_phone.cgi, 1.26, 1.27

[Mark Wells]

Update of /home/cvs/cvsroot/freeside/httemplate/view
In directory wavetail.420.am:/tmp/cvs-serv29538/httemplate/view

Modified Files:
	svc_acct.cgi svc_broadband.cgi svc_phone.cgi 
Added Files:
	svc_dish.cgi svc_hardware.cgi 
Log Message:
svc_hardware and svc_dish, #11454

--- NEW FILE: svc_dish.cgi ---
<% include('elements/svc_Common.html',
            'table'        => 'svc_dish',
            'labels'       => \%labels,
            'fields'       => \@fields,
          )
%>
<%init>

my $fields = FS::svc_dish->table_info->{'fields'};
my %labels = map { $_ =>  ( ref($fields->{$_})
                             ? $fields->{$_}{'label'}
                             : $fields->{$_}
                         );
                 } keys %$fields;
my @fields = qw( acctnum note );
</%init>

Index: svc_broadband.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/svc_broadband.cgi,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -w -d -r1.19 -r1.20
--- svc_broadband.cgi	22 Jan 2011 02:45:27 -0000	1.19
+++ svc_broadband.cgi	1 Apr 2011 02:52:20 -0000	1.20
@@ -10,7 +10,7 @@
 
 <% include('/elements/init_overlib.html') %>
 
-<A HREF="<%$p%>edit/svc_broadband.cgi?<%$svcnum%>">Edit this information</A>
+<% include('/view/elements/svc_edit_link.html', $svc_acct) %>
 <BR>
 <%ntable("#cccccc")%>
   <TR>

--- NEW FILE: svc_hardware.cgi ---
<% include('elements/svc_Common.html',
            'table'        => 'svc_hardware',
            'labels'       => \%labels,
            'fields'       => \@fields,
          )
%>
<%init>

my $fields = FS::svc_hardware->table_info->{'fields'};
my %labels = map { $_ =>  ( ref($fields->{$_})
                             ? $fields->{$_}{'label'}
                             : $fields->{$_}
                         );
                 } keys %$fields;
my $model = { field => 'typenum',
              type  => 'text',
              value => sub { $_[0]->hardware_type->model }
            };
my $status = { field => 'statusnum',
               type  => 'text',
               value => sub { $_[0]->status_label }
            };
my @fields = ($model, qw( serial hw_addr ip_addr ), $status, 'note' );
</%init>

Index: svc_acct.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/svc_acct.cgi,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -w -d -r1.63 -r1.64
--- svc_acct.cgi	10 Dec 2010 22:08:35 -0000	1.63
+++ svc_acct.cgi	1 Apr 2011 02:52:19 -0000	1.64
@@ -38,8 +38,8 @@
 %>
 
 Service #<B><% $svcnum %></B>
-| <A HREF="<%$p%>edit/svc_acct.cgi?<%$svcnum%>">Edit this service</A>
-
+|
+<% include('/view/elements/svc_edit_link.html', 'svc' => $svc_acct) %>
 <% include( 'svc_acct/change_svc.html',
               'part_svc' => \@part_svc,
               %gopt,
@@ -105,7 +105,7 @@
 die "Unknown svcnum" unless $svc_acct;
 
 #false laziness w/all svc_*.cgi
-my $cust_svc = qsearchs( 'cust_svc' , { 'svcnum' => $svcnum } );
+my $cust_svc = $svc_acct->cust_svc;
 my $pkgnum = $cust_svc->getfield('pkgnum');
 my($cust_pkg, $custnum);
 if ($pkgnum) {

Index: svc_phone.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/svc_phone.cgi,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -w -d -r1.26 -r1.27
--- svc_phone.cgi	18 Jan 2011 03:48:49 -0000	1.26
+++ svc_phone.cgi	1 Apr 2011 02:52:20 -0000	1.27
@@ -137,7 +137,7 @@
   #src & charged party as per voip_cdr.pm
   my $search;
   my $cust_pkg = $svc_phone->cust_svc->cust_pkg;
-  if ( $cust_pkg && $cust_pkg->part_pkg->option('disable_src') ) {
+  if ( $cust_pkg && $cust_pkg->part_pkg->option('disable_src',1) ) {
     $search = "charged_party=$number";
   } else {
     $search = "charged_party_or_src=$number";