[freeside-commits] freeside/httemplate/view svc_dsl.cgi,1.2,1.3

[Erik Levinson]

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

Modified Files:
	svc_dsl.cgi 
Log Message:
more sane svc_dsl UI, RT7111


Index: svc_dsl.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/svc_dsl.cgi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -d -r1.2 -r1.3
--- svc_dsl.cgi	25 Nov 2010 02:44:12 -0000	1.2
+++ svc_dsl.cgi	25 Nov 2010 20:02:55 -0000	1.3
@@ -7,8 +7,8 @@
           )
 %>
 <%init>
-my $conf = new FS::Conf;
-my $date_format = $conf->config('date_format') || '%m/%d/%Y';
+
+# XXX: AJAX auto-pull
 
 my $fields = FS::svc_dsl->table_info->{'fields'};
 my %labels = map { $_ =>  ( ref($fields->{$_})
@@ -38,21 +38,25 @@
     my $export = @exports[0];
     $opt->{'disable_unprovision'} = 1;
 
-    # XXX: AJAX auto-pull
-	
-    @fields = qw( svctn first last company username password );
+    @fields = ( 'svctn',
+	    { field => 'loop_type', 
+	      value => 'FS::part_export::'.$export->exporttype.'::loop_type_long'
+	    },
+	    { field => 'desired_dd', type => 'date', },
+	    { field => 'dd', type => 'date', },
+	    { field => 'pushed', type => 'datetime', },
+	    { field => 'monitored', type => 'checkbox', },
+	    { field => 'last_pull', type => 'datetime', },
+	    'first',
+	    'last',
+	    'company'  );
 
     if($export->exporttype eq 'ikano') {
-	push @fields, 'isp_chg';
-	push @fields, 'isp_prev';
-	push @fields, 'staticips';
-    }
-    else {
-	# XXX
+	push @fields, qw ( username password isp_chg isp_prev staticips );
     }
+    # else add any other export-specific stuff here
    
-    $footer = "<B>".$export->status_line($svc_x,$date_format,"<BR>")."</B>";
-
-    # XXX: notes
+    $footer = "<B>".$export->status_line($svc_x)."</B>";
+    $footer .= "<BR><BR><BR>Order Notes:<BR>".$export->notes_html;
 };
 </%init>