RT#32089: Ignore services when using packages based on active services

3 files changed, 25 insertions, 3 deletions

diff --git a/FS/FS/part_pkg/bulk.pm b/FS/FS/part_pkg/bulk.pm
index 4a55858de..bc42e20d2 100644
--- a/FS/FS/part_pkg/bulk.pm
+++ b/FS/FS/part_pkg/bulk.pm
@@ -27,7 +27,7 @@ $me = '[FS::part_pkg::bulk]';
 sub _bulk_cust_svc {
   my( $self, $cust_pkg, $sdate ) = @_;
                        #   END      START
-  $cust_pkg->h_cust_svc( $$sdate, $cust_pkg->last_bill );
+  return $self->_only_svcs_filter($cust_pkg->h_cust_svc( $$sdate, $cust_pkg->last_bill ));
 }
 
 sub _bulk_setup {
diff --git a/FS/FS/part_pkg/bulk_Common.pm b/FS/FS/part_pkg/bulk_Common.pm
index 67f2caf44..a9231bc5c 100644
--- a/FS/FS/part_pkg/bulk_Common.pm
+++ b/FS/FS/part_pkg/bulk_Common.pm
@@ -5,6 +5,7 @@ use strict;
 use vars qw($DEBUG $me %info);
 use Date::Format;
 use FS::Conf;
+use FS::Record qw(qsearchs);
 
 $DEBUG = 0;
 $me = '[FS::part_pkg::bulk_Common]';
@@ -23,8 +24,17 @@ $me = '[FS::part_pkg::bulk_Common]';
                                    'instead of a detailed list',
                          'type' => 'checkbox',
                        },
+    'only_svcs' => {
+      'name' => 'Only charge fees for these services',
+      'type' => 'select_multiple',
+      'select_table'  => 'part_svc',
+      'select_key'    => 'svcpart',
+      'select_label'  => 'svc',
+      'disable_empty' => 1,
+      'parse'         => sub { @_ }, #should this be the default in /edit/process/part_pkg.cgi?
+    },
   },
-  'fieldorder' => [ 'svc_setup_fee', 'svc_recur_fee',
+  'fieldorder' => [ 'svc_setup_fee', 'svc_recur_fee', 'only_svcs',
                     'summarize_svcs', 'no_prorate' ],
   'weight' => 51,
 );
@@ -123,5 +133,17 @@ sub is_free_options {
 
 sub can_usageprice { 0; }
 
+sub _only_svcs_filter {
+  my ($self, @cust_svc) = @_;
+  my @only_svcs = split(', ',$self->option('only_svcs',1));
+  if (@only_svcs) {
+    @cust_svc = grep { 
+      my $svcpart = $_->svcpart;
+      grep(/^$svcpart$/,@only_svcs);
+    } @cust_svc;
+  }
+  return @cust_svc;
+}
+
 1;
 
diff --git a/FS/FS/part_pkg/bulk_simple.pm b/FS/FS/part_pkg/bulk_simple.pm
index 93944cc0a..6ed125022 100644
--- a/FS/FS/part_pkg/bulk_simple.pm
+++ b/FS/FS/part_pkg/bulk_simple.pm
@@ -18,7 +18,7 @@ $me = '[FS::part_pkg::bulk]';
 
 sub _bulk_cust_svc {
   my( $self, $cust_pkg, $sdate ) = @_;
-  $cust_pkg->cust_svc;
+  return $self->_only_svcs_filter($cust_pkg->cust_svc);
 }
 
 sub _bulk_setup {