import torrus 1.0.9

[freeside.git] / FS / FS / part_export / internal_diddb.pm

diff --git a/FS/FS/part_export/internal_diddb.pm b/FS/FS/part_export/internal_diddb.pm
index aa04b77..a330cb0 100644 (file)
--- a/FS/FS/part_export/internal_diddb.pm
+++ b/FS/FS/part_export/internal_diddb.pm
@@ -25,7 +25,7 @@ sub get_dids {
   my $self = shift;
   my %opt = ref($_[0]) ? %{$_[0]} : @_;
 
-  my %hash = ( 'countrycode' => $self->option('countrycode'),
+  my %hash = ( 'countrycode' => ( $self->option('countrycode') || '1' ),
                'exportnum'   => $self->exportnum,
                'svcnum'      => '',
              );
@@ -80,7 +80,7 @@ sub _export_insert   { #link phone_avail to svcnum
   my( $npa, $nxx, $station ) = ($1, $2, $3);
 
   my $phone_avail = qsearchs('phone_avail', {
-    'countrycode' => $self->option('countrycode'),
+    'countrycode' => ( $self->option('countrycode') || '1' ),
     'exportnum'   => $self->exportnum,
     'svcnum'      => '',
     'npa'         => $npa,
@@ -100,12 +100,12 @@ sub _export_insert   { #link phone_avail to svcnum
 sub _export_delete   { #unlink phone_avail from svcnum
   my( $self, $svc_phone ) = (shift, shift);
 
-  $svc_phone =~ /^(\d{3})(\d{3})(\d+)$/
+  $svc_phone->phonenum =~ /^(\d{3})(\d{3})(\d+)$/
     or return "unparsable phone number: ". $svc_phone->phonenum;
   my( $npa, $nxx, $station ) = ($1, $2, $3);
 
   my $phone_avail = qsearchs('phone_avail', {
-    'countrycode' => $self->option('countrycode'),
+    'countrycode' => ( $self->option('countrycode') || '1'),
     'exportnum'   => $self->exportnum,
     'svcnum'      => $svc_phone->svcnum,
     #these too?