-change ikano.pm to use the new part_pkg_vendor, RT7111

-implement service expiry and add export expire to ikano, RT7111
-fix edit part_pkg bug, RT7111

1 files changed, 19 insertions, 1 deletions

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index e3f4777..b97bc93 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -661,7 +661,25 @@ sub cancel {
   }
 
   my %svc;
-  unless ( $date ) {
+  if ( $date ) {
+	# copied from below
+	foreach my $cust_svc (
+	  #schwartz
+	  map  { $_->[0] }
+	  sort { $a->[1] <=> $b->[1] }
+	  map  { [ $_, $_->svc_x->table_info->{'cancel_weight'} ]; }
+	  qsearch( 'cust_svc', { 'pkgnum' => $self->pkgnum } )
+	) {
+
+	  my $error = $cust_svc->cancel( ('date' => $date) );
+
+	  if ( $error ) {
+	    $dbh->rollback if $oldAutoCommit;
+	    return "Error expiring cust_svc: $error";
+	  }
+	}
+
+  } else {
     foreach my $cust_svc (
       #schwartz
       map  { $_->[0] }