projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3e1479b
)
unhack stuff from the last commit, RT7111
author
levinse
<levinse>
Thu, 25 Nov 2010 02:44:12 +0000
(
02:44
+0000)
committer
levinse
<levinse>
Thu, 25 Nov 2010 02:44:12 +0000
(
02:44
+0000)
FS/FS/part_export/ikano.pm
patch
|
blob
|
history
httemplate/view/svc_dsl.cgi
patch
|
blob
|
history
diff --git
a/FS/FS/part_export/ikano.pm
b/FS/FS/part_export/ikano.pm
index
c44db64
..
b14f3a4
100644
(file)
--- a/
FS/FS/part_export/ikano.pm
+++ b/
FS/FS/part_export/ikano.pm
@@
-37,7
+37,7
@@
sub dsl_pull {
}
sub status_line {
}
sub status_line {
- my($s
vc_dsl,$date_format,$separator) = (
shift,shift,shift);
+ my($s
elf,$svc_dsl,$date_format,$separator) = (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 %orderTypes = ( 'N' => 'New', 'X' => 'Cancel', 'C' => 'Change' );
my %orderStatus = ( 'N' => 'New', 'P' => 'Pending', 'X' => 'Cancelled',
'C' => 'Completed', 'E' => 'Error' );
diff --git
a/httemplate/view/svc_dsl.cgi
b/httemplate/view/svc_dsl.cgi
index
a4b2d43
..
b460c01
100644
(file)
--- a/
httemplate/view/svc_dsl.cgi
+++ b/
httemplate/view/svc_dsl.cgi
@@
-35,14
+35,14
@@
my $svc_cb = sub {
# default behaviour implemented above
return if ( scalar(@exports) == 0 );
# default behaviour implemented above
return if ( scalar(@exports) == 0 );
+ my $export = @exports[0];
$opt->{'disable_unprovision'} = 1;
$opt->{'disable_unprovision'} = 1;
- my $exporttype = @exports[0]->exporttype;
# XXX: AJAX auto-pull
@fields = qw( svctn first last company username password );
# XXX: AJAX auto-pull
@fields = qw( svctn first last company username password );
- if($exporttype eq 'ikano') {
+ if($export
->export
type eq 'ikano') {
push @fields, 'isp_chg';
push @fields, 'isp_prev';
push @fields, 'staticips';
push @fields, 'isp_chg';
push @fields, 'isp_prev';
push @fields, 'staticips';
@@
-50,12
+50,8
@@
my $svc_cb = sub {
else {
# XXX
}
else {
# XXX
}
-
- # hack against "can't use string ... as a subroutine ref while 'strict refs' in use"
- my $statusSub = \&{'FS::part_export::'.$exporttype.'::status_line'};
- my $statusLine = &$statusSub($svc_x,$date_format,"<BR>");
-
- $footer = "<B>$statusLine</B>";
+
+ $footer = "<B>".$export->status_line($svc_x,$date_format,"<BR>")."</B>";
# XXX: notes
};
# XXX: notes
};