X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_svc.pm;h=381b97f14dd584cc3d3a8274727b6a185d4f79d7;hb=6161489c74f82e0765812a14615a7bc2ae3350cf;hp=af54f2230b22e727ee7d95d1ddb2122a56505cdb;hpb=556cefb34ed648303951009e3bec919e18532bed;p=freeside.git

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index af54f2230..381b97f14 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -132,22 +132,30 @@ sub cancel {
 
   my $svc = $self->svc_x;
   if ($svc) {
+
     my $error = $svc->cancel;
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
       return "Error canceling service: $error";
     }
-    $error = $svc->delete;
+    $error = $svc->delete; #this deletes this cust_svc record as well
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
       return "Error deleting service: $error";
     }
-  }
 
-  my $error = $self->delete;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return "Error deleting cust_svc: $error";
+  } else {
+
+    #huh?
+    warn "WARNING: no svc_ record found for svcnum ". $self->svcnum.
+         "; deleting cust_svc only\n"; 
+
+    my $error = $self->delete;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "Error deleting cust_svc: $error";
+    }
+
   }
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
@@ -321,6 +329,34 @@ sub cust_pkg {
   qsearchs( 'cust_pkg', { 'pkgnum' => $self->pkgnum } );
 }
 
+=item pkg_svc
+
+Returns the pkg_svc record for for this service, if applicable.
+
+=cut
+
+sub pkg_svc {
+  my $self = shift;
+  my $cust_pkg = $self->cust_pkg;
+  return undef unless $cust_pkg;
+
+  qsearchs( 'pkg_svc', { 'svcpart' => $self->svcpart,
+                         'pkgpart' => $cust_pkg->pkgpart,
+                       }
+          );
+}
+
+=item date_inserted
+
+Returns the date this service was inserted.
+
+=cut
+
+sub date_inserted {
+  my $self = shift;
+  $self->h_date('insert');
+}
+
 =item label
 
 Returns a list consisting of:
@@ -356,6 +392,20 @@ sub _svc_label {
 
 }
 
+=item export_links
+
+Returns a list of html elements associated with this services exports.
+
+=cut
+
+sub export_links {
+  my $self = shift;
+  my $svc_x = $self->svc_x
+    or return "can't find ". $self->part_svc->svcdb. '.svcnum '. $self->svcnum;
+
+  $svc_x->export_links;
+}
+
 =item svc_x
 
 Returns the FS::svc_XXX object for this service (i.e. an FS::svc_acct object or
@@ -592,74 +642,35 @@ CDRs are associated with svc_phone services via svc_phone.phonenum
 sub get_cdrs_for_update {
   my($self, %options) = @_;
 
-  my $default_prefix = $options{'default_prefix'};
+  my @fields = ( 'charged_party' );
+  push @fields, 'src' unless $options{'disable_src'};
 
   #CDRs are now associated with svc_phone services via svc_phone.phonenum
   #return () unless $self->svc_x->isa('FS::svc_phone');
   return () unless $self->part_svc->svcdb eq 'svc_phone';
   my $number = $self->svc_x->phonenum;
 
-  my @cdrs = 
-    qsearch( {
-      'table'      => 'cdr',
-      'hashref'    => { 'freesidestatus' => '',
-                        'charged_party'  => $number
-                      },
-      'extra_sql'  => 'FOR UPDATE',
-    } );
+  my $prefix = $options{'default_prefix'};
 
-  if ( length($default_prefix) ) {
-    push @cdrs,
-      qsearch( {
-        'table'      => 'cdr',
-        'hashref'    => { 'freesidestatus' => '',
-                          'charged_party'  => "$default_prefix$number",
-                        },
-        'extra_sql'  => 'FOR UPDATE',
-      } );
+  my @where =  map " $_ = '$number'        ", @fields;
+  push @where, map " $_ = '$prefix$number' ", @fields
+    if length($prefix);
+  if ( $prefix =~ /^\+(\d+)$/ ) {
+    push @where, map " $_ = '$1$number' ", @fields
   }
 
-  #astricon hack?  config option?
-  push @cdrs,
+  my $extra_sql = ' AND ( '. join(' OR ', @where ). ' ) ';
+
+  my @cdrs =
     qsearch( {
-      'table'        => 'cdr',
-      'hashref'      => { 'freesidestatus' => '',
-                          'src'            => $number,
-			},
-      'extra_sql'    => 'FOR UPDATE',
-     } );
-
-  if ( length($default_prefix) ) {
-    push @cdrs,
-      qsearch( {
-        'table'        => 'cdr',
-        'hashref'      => { 'freesidestatus' => '',
-                            'src'            => "$default_prefix$number",
-  			},
-        'extra_sql'    => 'FOR UPDATE',
-       } );
-  }
+      'table'      => 'cdr',
+      'hashref'    => { 'freesidestatus' => '', },
+      'extra_sql'  => "$extra_sql FOR UPDATE",
+    } );
 
   @cdrs;
 }
 
-=item pkg_svc
-
-Returns the pkg_svc record for for this service, if applicable.
-
-=cut
-
-sub pkg_svc {
-  my $self = shift;
-  my $cust_pkg = $self->cust_pkg;
-  return undef unless $cust_pkg;
-
-  qsearchs( 'pkg_svc', { 'svcpart' => $self->svcpart,
-                         'pkgpart' => $cust_pkg->pkgpart,
-                       }
-          );
-}
-
 =back
 
 =head1 BUGS