[freeside-commits] freeside/FS/FS/part_export ikano.pm,1.2,1.3

[Erik Levinson]

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

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


Index: ikano.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_export/ikano.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -d -r1.2 -r1.3
--- ikano.pm	25 Nov 2010 02:44:11 -0000	1.2
+++ ikano.pm	25 Nov 2010 20:02:54 -0000	1.3
@@ -37,25 +37,19 @@
 }
 
 sub status_line {
-    my($self,$svc_dsl,$date_format,$separator) = (shift,shift,shift,shift);
+    my($self,$svc_dsl) = (shift,shift,shift,shift);
     my %orderTypes = ( 'N' => 'New', 'X' => 'Cancel', 'C' => 'Change' );
     my %orderStatus = ( 'N' => 'New', 'P' => 'Pending', 'X' => 'Cancelled',
 			'C' => 'Completed', 'E' => 'Error' );
-    my $status = "Ikano ".$orderTypes{$svc_dsl->vendor_order_type}." order #"
+    return "Ikano ".$orderTypes{$svc_dsl->vendor_order_type}." order #"
 	. $svc_dsl->vendor_order_id . " (Status: " 
-	. $orderStatus{$svc_dsl->vendor_order_status} . ") $separator ";
-    my $monitored = $svc_dsl->monitored eq 'Y' ? 'Yes' : 'No';
-    my $pushed = $svc_dsl->pushed ? 
-		time2str("$date_format %k:%M",$svc_dsl->pushed) : "never";
-    my $last_pull = $svc_dsl->last_pull ? 
-		time2str("$date_format %k:%M",$svc_dsl->last_pull) : "never";
-    my $ddd = $svc_dsl->desired_dd ? time2str($date_format,$svc_dsl->desired_dd)
-				   : "";
-    my $dd = $svc_dsl->dd ? time2str($date_format,$svc_dsl->dd) : "";
-    $status .= "$separator Pushed: $pushed   Monitored: $monitored  Last Pull: ";
-    $status .= "$lastpull $separator $separator Desired Due Date: $ddd  ";
-    $status .= "Due Date: $dd";
-    return $status;	
+	. $orderStatus{$svc_dsl->vendor_order_status} . ")";
+}
+
+sub loop_type_long {
+    my($svc_dsl) = shift;
+    return "Standalone" if $svc_dsl->loop_type eq '0';
+    return "Line-share";
 }
 
 sub ikano_command {