X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_dsl.cgi;h=477da268bf5b82b17d71087fe09e2386d80124d1;hp=9d9134a4d34f87439356a1d9571c260c2bbe62ed;hb=c9678906cb89a0c05a67d8118898202b64f84fd6;hpb=a87829a0945ad5199b8676756c3186a7139d086d diff --git a/httemplate/view/svc_dsl.cgi b/httemplate/view/svc_dsl.cgi index 9d9134a4d..477da268b 100644 --- a/httemplate/view/svc_dsl.cgi +++ b/httemplate/view/svc_dsl.cgi @@ -33,33 +33,44 @@ my $svc_cb = sub { # if no DSL-pulling exports, then just display everything, which is the # default behaviour implemented above - return if ( scalar(@exports) == 0 ); - - 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' ); - - my $status = ''; - if($export->exporttype eq 'ikano') { - push @fields, qw ( username password isp_chg isp_prev staticips ); - $status = "Ikano " . $svc_dsl->vendor_order_type . " order #" - . $svc_dsl->vendor_order_id . "   Status: " - . $svc_dsl->vendor_order_status; - } - # else add any other export-specific stuff here + if ( scalar(@exports) ) { + + 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', + ); + + my $status = ''; + if($export->exporttype eq 'ikano') { + push @fields, qw ( username password isp_chg isp_prev staticips ); + $status = "Ikano " . $svc_dsl->vendor_order_type . " order #" + . $svc_dsl->vendor_order_id . "   Status: " + . $svc_dsl->vendor_order_status; + } + # else add any other export-specific stuff here - $footer = "$status"; + $footer = "$status"; + + } + + $footer .= '

'. + include( '/view/elements/svc_devices.html', + 'svc_x' => $svc_dsl, + 'table' => 'dsl_device', + 'no_edit' => 1, + ); my @notes = $svc_dsl->notes; if ( @notes ) { @@ -68,7 +79,7 @@ my $svc_cb = sub { my $date_format = $conf->config('date_format') || '%m/%d/%Y'; $footer .= - "

Order Notes
". ntable('#cccccc', 2). #id="dsl_notes" + "Order Notes
". ntable('#cccccc', 2). #id="dsl_notes" 'DateByPriorityNote'; foreach my $note ( @notes ) {