X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fagent.pm;fp=FS%2FFS%2Fpart_pkg%2Fagent.pm;h=1a5b6154e759910af3d137fda0f91e6dd234dfaa;hb=d9085d3f37cd6e9b1bad068cfdce945053cf669f;hp=e1165c4c4af45a6a8106ab30ff6c6d9483d71bc1;hpb=c1a674eb92448c96c82517377069359c487d8642;p=freeside.git diff --git a/FS/FS/part_pkg/agent.pm b/FS/FS/part_pkg/agent.pm index e1165c4c4..1a5b6154e 100644 --- a/FS/FS/part_pkg/agent.pm +++ b/FS/FS/part_pkg/agent.pm @@ -14,8 +14,8 @@ $DEBUG = 0; $me = '[FS::part_pkg::agent]'; %info = ( - 'name' => 'Wholesale bulk billing, for master customers of an agent.', - 'shortname' => 'Wholesale bulk billing for agent', + 'name' => 'Wholesale billing based on package prices, for master customers of an agent.', + 'shortname' => 'Wholesale billing for agent (package prices)', 'inherit_fields' => [qw( prorate global_Mixin)], 'fields' => { #'recur_method' => { 'name' => 'Recurring fee method', @@ -94,12 +94,13 @@ sub calc_recur { if $DEBUG; #make sure setup dates are filled in - my $error = $cust_main->bill; #options don't propogate from freeside-daily + my $error = $cust_main->bill( time => $$sdate ); die "Error pre-billing agent customer: $error" if $error; my @cust_pkg = grep { my $setup = $_->get('setup'); my $cancel = $_->get('cancel'); + #$setup <= $$sdate # ? $setup < $$sdate # END && ( ! $cancel || $cancel > $last_bill ) #START }