projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e1fbc06
)
be more accepting
author
jeff
<jeff>
Mon, 24 Nov 2008 15:18:42 +0000
(15:18 +0000)
committer
jeff
<jeff>
Mon, 24 Nov 2008 15:18:42 +0000
(15:18 +0000)
FS/FS/part_export/soma.pm
patch
|
blob
|
history
diff --git
a/FS/FS/part_export/soma.pm
b/FS/FS/part_export/soma.pm
index
b290db8
..
a0b433d
100644
(file)
--- a/
FS/FS/part_export/soma.pm
+++ b/
FS/FS/part_export/soma.pm
@@
-381,7
+381,11
@@
sub esn {
my ( $self, $svc ) = @_;
my $svcdb = $svc->cust_svc->part_svc->svcdb;
my ( $self, $svc ) = @_;
my $svcdb = $svc->cust_svc->part_svc->svcdb;
- return sprintf( '%016X', $svc->title ) if $svcdb eq 'svc_external';
+ if ($svcdb eq 'svc_external') {
+ my $esn = $svc->title;
+ $esn =~ /^\s*(\d[a-fA-F])+\s*$/ && ($esn = $1);
+ return sprintf( '%016X', $esn ) if $svcdb eq 'svc_external';
+ }
my $cust_pkg = $svc->cust_svc->cust_pkg;
return '' unless $cust_pkg;
my $cust_pkg = $svc->cust_svc->cust_pkg;
return '' unless $cust_pkg;
@@
-394,7
+398,10
@@
sub esn {
warn "part_export::soma found multiple ESNs for cust_svc ". $svc->svcnum
if scalar( @cust_svc ) > 1;
warn "part_export::soma found multiple ESNs for cust_svc ". $svc->svcnum
if scalar( @cust_svc ) > 1;
- sprintf( '%016X', $cust_svc[0]->svc_x->title );
+ my $esn = $cust_svc[0]->svc_x->title;
+ $esn =~ /^\s*(\d[a-fA-F])+\s*$/ && ($esn = $1);
+
+ sprintf( '%016X', $esn );
}
}