de-uglify DSL notes, RT#7111

2 files changed, 44 insertions, 41 deletions

diff --git a/FS/FS/part_export/ikano.pm b/FS/FS/part_export/ikano.pm
index 4323d94f3..e34a3d898 100644
--- a/FS/FS/part_export/ikano.pm
+++ b/FS/FS/part_export/ikano.pm
@@ -408,24 +408,6 @@ sub quals_by_cust_and_pkg {
     @filtered_quals;
 }
 
-sub notes_html { 
-    my($self,$svc_dsl) = (shift,shift);
-    my $conf = new FS::Conf;
-    my $date_format = $conf->config('date_format') || '%m/%d/%Y';
-    my @notes = $svc_dsl->notes;
-    my $html = '<TABLE border="1" cellspacing="2" cellpadding="2" id="dsl_notes">
-	<TR><TH>Date</TH><TH>By</TH><TH>Priority</TH><TH>Note</TH></TR>';
-    foreach my $note ( @notes ) {
-	$html .= "<TR>
-	    <TD>".time2str("$date_format %H:%M",$note->date)."</TD>
-	    <TD>".$note->by."</TD>
-	    <TD>". ($note->priority eq 'N' ? 'Normal' : 'High') ."</TD>
-	    <TD>".$note->note."</TD></TR>";
-    }
-    $html .= '</TABLE>';
-    $html;
-}
-
 sub loop_type_long { # sub, not a method
     my($svc_dsl) = (shift);
     return $loopType{$svc_dsl->loop_type};
diff --git a/httemplate/view/svc_dsl.cgi b/httemplate/view/svc_dsl.cgi
index ade13501b..9d9134a4d 100644
--- a/httemplate/view/svc_dsl.cgi
+++ b/httemplate/view/svc_dsl.cgi
@@ -1,9 +1,9 @@
 <% include('elements/svc_Common.html',
-            'table'     => 'svc_dsl',
-            'labels'    => \%labels,
-            'fields' => \@fields,
-	    'svc_callback' => $svc_cb,
-	    'html_foot' => $html_foot,
+            'table'        => 'svc_dsl',
+            'labels'       => \%labels,
+            'fields'       => \@fields,
+            'svc_callback' => $svc_cb,
+            'html_foot'    => $html_foot,
           )
 %>
 <%init>
@@ -25,11 +25,11 @@ my $html_foot = sub {
 };
 
 my $svc_cb = sub {
-    my( $cgi,$svc_x, $part_svc,$cust_pkg, $fields1,$opt) = @_;
+    my( $cgi,$svc_dsl, $part_svc,$cust_pkg, $fields1,$opt) = @_;
 
     my @exports = $part_svc->part_export_dsl_pull;
     die "more than one DSL-pulling export attached to svcpart ".$part_svc->svcpart
-	if ( scalar(@exports) > 1 );
+        if ( scalar(@exports) > 1 );
     
     # if no DSL-pulling exports, then just display everything, which is the
     # default behaviour implemented above
@@ -38,28 +38,49 @@ my $svc_cb = sub {
     my $export = @exports[0];
 
     @fields = ( 'phonenum',
-	    { field => 'loop_type', 
-	      value => 'FS::part_export::'.$export->exporttype.'::loop_type_long'
-	    },
-	    { field => 'desired_due_date', type => 'date', },
-	    { field => 'due_date', type => 'date', },
-	    { field => 'pushed', type => 'datetime', },
-	    { field => 'monitored', type => 'checkbox', },
-	    { field => 'last_pull', type => 'datetime', },
-	    'first',
-	    'last',
-	    'company'  );
+            { field => 'loop_type', 
+              value => 'FS::part_export::'.$export->exporttype.'::loop_type_long'
+            },
+            { field => 'desired_due_date', type => 'date', },
+            { field => 'due_date', type => 'date', },
+            { field => 'pushed', type => 'datetime', },
+            { field => 'monitored', type => 'checkbox', },
+            { field => 'last_pull', type => 'datetime', },
+            'first',
+            'last',
+            'company'  );
 
     my $status = '';
     if($export->exporttype eq 'ikano') {
-	push @fields, qw ( username password isp_chg isp_prev staticips );
-	$status = "Ikano " . $svc_x->vendor_order_type . " order #"
-		. $svc_x->vendor_order_id . " &nbsp; Status: " 
-		. $svc_x->vendor_order_status;
+        push @fields, qw ( username password isp_chg isp_prev staticips );
+        $status = "Ikano " . $svc_dsl->vendor_order_type . " order #"
+                . $svc_dsl->vendor_order_id . " &nbsp; Status: " 
+                . $svc_dsl->vendor_order_status;
     }
     # else add any other export-specific stuff here
    
     $footer = "<B>$status</B>";
-    $footer .= "<BR><BR><BR><B>Order Notes:</B><BR>".$export->notes_html($svc_x);
+
+    my @notes = $svc_dsl->notes;
+    if ( @notes ) {
+
+      my $conf = new FS::Conf;
+      my $date_format = $conf->config('date_format') || '%m/%d/%Y';
+
+      $footer .=
+        "<BR><BR>Order Notes<BR>". ntable('#cccccc', 2). #id="dsl_notes"
+        '<TR><TH>Date</TH><TH>By</TH><TH>Priority</TH><TH>Note</TH></TR>';
+
+      foreach my $note ( @notes ) {
+        $footer .= "<TR>
+            <TD>".time2str("$date_format %H:%M",$note->date)."</TD>
+            <TD>".$note->by."</TD>
+            <TD>". ($note->priority eq 'N' ? 'Normal' : 'High') ."</TD>
+            <TD>".$note->note."</TD></TR>";
+      }
+
+      $footer .= '</TABLE>';
+
+    }
 };
 </%init>