add a netcredits_12mo sub so that 12mo checkbox works again... sure do need these...

[freeside.git] / FS / FS / cust_svc.pm

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index bcf66e7..f168567 100644 (file)
--- 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;
@@ -384,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
@@ -620,6 +642,17 @@ CDRs are associated with svc_phone services via svc_phone.phonenum
 sub get_cdrs_for_update {
   my($self, %options) = @_;
 
+  my @cdrs = $self->get_cdrs_fromfield('charged_party', %options);
+
+  push @cdrs, $self->get_cdrs_fromfield('src', %options)
+    unless $options{'disable_src'};
+
+  @cdrs;
+}
+
+sub get_cdrs_fromfield {
+  my($self, $field, %options) = @_;
+
   my $default_prefix = $options{'default_prefix'};
 
   #CDRs are now associated with svc_phone services via svc_phone.phonenum
@@ -631,7 +664,7 @@ sub get_cdrs_for_update {
     qsearch( {
       'table'      => 'cdr',
       'hashref'    => { 'freesidestatus' => '',
-                        'charged_party'  => $number
+                        $field           => $number
                       },
       'extra_sql'  => 'FOR UPDATE',
     } );
@@ -641,33 +674,12 @@ sub get_cdrs_for_update {
       qsearch( {
         'table'      => 'cdr',
         'hashref'    => { 'freesidestatus' => '',
-                          'charged_party'  => "$default_prefix$number",
+                          $field           => "$default_prefix$number",
                         },
         'extra_sql'  => 'FOR UPDATE',
       } );
   }
 
-  #astricon hack?  config option?
-  push @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',
-       } );
-  }
-
   @cdrs;
 }