X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fbulk_Common.pm;h=a9231bc5ced375e13cab8c7435f4ea60c4673e52;hb=57bb423fe457ba4e13726877f53bcdf944f828f8;hp=2ee25488b3022c8a4bf57ee451f8c5e5adb306b2;hpb=7b153f2ca026421681ffd5f37c95efdff4f0a5d1;p=freeside.git

diff --git a/FS/FS/part_pkg/bulk_Common.pm b/FS/FS/part_pkg/bulk_Common.pm
index 2ee25488b..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,20 +24,29 @@ $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,
 );
 
 sub price_info {
     my $self = shift;
-    my $str = $self->SUPER::price_info;
+    my $str = $self->SUPER::price_info(@_);
     my $svc_setup_fee = $self->option('svc_setup_fee');
     my $svc_recur_fee = $self->option('svc_recur_fee');
     my $conf = new FS::Conf;
     my $money_char = $conf->config('money_char') || '$';
-    $str .= " , bulk" if $str;
+    $str .= ", bulk " if $str;
     $str .= ": $money_char" . $svc_setup_fee . " one-time per service" 
 	if $svc_setup_fee;
     $str .= ", " if ($svc_setup_fee && $svc_recur_fee);
@@ -47,7 +57,7 @@ sub price_info {
 
 #some false laziness-ish w/agent.pm...  not a lot
 sub calc_recur {
-  my($self, $cust_pkg, $sdate, $details ) = @_;
+  my($self, $cust_pkg, $sdate, $details, $param ) = @_;
 
   my $conf = new FS::Conf;
   my $money_char = $conf->config('money_char') || '$';
@@ -70,7 +80,8 @@ sub calc_recur {
     next if $pkg_svc->bulk_skip;
 
     my @label = $cust_svc->label_long( $$sdate, $last_bill );
-    die "fatal: no label found, wtf?" unless scalar(@label); #?
+    die "fatal: no label found for svcnum ". $cust_svc->svcnum
+      unless scalar(@label); #?
     my $svc_details = $label[0]. ': '. $label[1]. ': ';
     $part_svc_label{$cust_svc->svcpart} ||= $label[0];
 
@@ -120,5 +131,19 @@ sub is_free_options {
   qw( setup_fee recur_fee svc_setup_fee svc_recur_fee );
 }
 
+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;