X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fcust_svc.pm;h=0a58d559a1570d79611cd45ff8895f36668315c3;hp=7b866fad382259bb6864682ae778f627ef3fd3fb;hb=90393980e5f2859ee1e186fa461f48f5129e803e;hpb=b90c466e6b0d4477855ff3ff7b8f40937b129364

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index 7b866fad3..0a58d559a 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -109,7 +109,7 @@ If there is an error, returns the error, otherwise returns false.
 =cut
 
 sub cancel {
-  my $self = shift;
+  my($self,%opt) = @_;
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -133,19 +133,26 @@ 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; #this deletes this cust_svc record as well
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "Error deleting service: $error";
+    if ( %opt && $opt{'date'} ) {
+	my $error = $svc->expire($opt{'date'});
+	if ( $error ) {
+	  $dbh->rollback if $oldAutoCommit;
+	  return "Error expiring service: $error";
+	}
+    } else {
+	my $error = $svc->cancel;
+	if ( $error ) {
+	  $dbh->rollback if $oldAutoCommit;
+	  return "Error canceling service: $error";
+	}
+	$error = $svc->delete; #this deletes this cust_svc record as well
+	if ( $error ) {
+	  $dbh->rollback if $oldAutoCommit;
+	  return "Error deleting service: $error";
+	}
     }
 
-  } else {
+  } elsif ( !%opt ) {
 
     #huh?
     warn "WARNING: no svc_ record found for svcnum ". $self->svcnum.