more sane svc_dsl UI, RT7111

2 files changed, 26 insertions, 16 deletions

diff --git a/httemplate/view/elements/svc_Common.html b/httemplate/view/elements/svc_Common.html
index 25845ddc5..e3b8da4fe 100644
--- a/httemplate/view/elements/svc_Common.html
+++ b/httemplate/view/elements/svc_Common.html
@@ -65,10 +65,10 @@ Unprovision this Service</A>
 %
 %   my($field, $type, $value, $hack_strict_refs);
 %   if ( ref($f) ) {
-%     $field = $f->{'field'},
+%     $field = $f->{'field'};
 %     $hack_strict_refs = \&{ $f->{'value'} } if $f->{'value'};
 %     $value = $f->{'value'} ? &$hack_strict_refs($svc_x) : $svc_x->$field;
-%     $type  = $f->{'type'} || 'text',
+%     $type  = $f->{'type'} || 'text';
 %   } else {
 %     $field = $f;
 %     $value = $svc_x->$field;
@@ -86,6 +86,9 @@ Unprovision this Service</A>
           %>
         </TD>
 
+%	$value = time2str($date_format,$value) if ( $type eq 'date' && $value );
+%	$value = time2str("$date_format %H:%M",$value) if ( $type eq 'datetime' && $value );
+%	$value = $value eq 'Y' ? 'Yes' : 'No' if ( $type eq 'checkbox' );
 %       #eventually more options for <SELECT>, etc. fields
 
         <TD BGCOLOR="#ffffff"><% $value %><TD>
@@ -125,6 +128,9 @@ die "access denied"
 
 my(%opt) = @_;
 
+my $conf = new FS::Conf;
+my $date_format = $conf->config('date_format') || '%m/%d/%Y';
+
 my $table = $opt{'table'};
 
 my $fields = $opt{'fields'}
diff --git a/httemplate/view/svc_dsl.cgi b/httemplate/view/svc_dsl.cgi
index b460c010e..fd998ae60 100644
--- a/httemplate/view/svc_dsl.cgi
+++ b/httemplate/view/svc_dsl.cgi
@@ -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 $svc_cb = sub {
     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>