projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
better error
[freeside.git]
/
FS
/
FS
/
part_pkg
/
bulk_Common.pm
diff --git
a/FS/FS/part_pkg/bulk_Common.pm
b/FS/FS/part_pkg/bulk_Common.pm
index
67a683a
..
67f2caf
100644
(file)
--- a/
FS/FS/part_pkg/bulk_Common.pm
+++ b/
FS/FS/part_pkg/bulk_Common.pm
@@
-31,12
+31,12
@@
$me = '[FS::part_pkg::bulk_Common]';
sub price_info {
my $self = shift;
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') || '$';
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);
$str .= ": $money_char" . $svc_setup_fee . " one-time per service"
if $svc_setup_fee;
$str .= ", " if ($svc_setup_fee && $svc_recur_fee);
@@
-47,7
+47,7
@@
sub price_info {
#some false laziness-ish w/agent.pm... not a lot
sub calc_recur {
#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') || '$';
my $conf = new FS::Conf;
my $money_char = $conf->config('money_char') || '$';
@@
-58,13
+58,20
@@
sub calc_recur {
my %n_setup = ();
my %n_recur = ();
my %part_svc_label = ();
my %n_setup = ();
my %n_recur = ();
my %part_svc_label = ();
+ my %pkg_svc = ();
my $summarize = $self->option('summarize_svcs',1);
foreach my $cust_svc ( $self->_bulk_cust_svc( $cust_pkg, $sdate ) ) {
my $summarize = $self->option('summarize_svcs',1);
foreach my $cust_svc ( $self->_bulk_cust_svc( $cust_pkg, $sdate ) ) {
+ my $pkg_svc = $pkg_svc{ $cust_pkg->pkgpart. '_'. $cust_svc->svcpart }
+ ||= qsearchs('pkg_svc', { 'pkgpart' => $cust_pkg->pkgpart,
+ 'svcpart' => $cust_svc->svcpart});
+ next if $pkg_svc->bulk_skip;
+
my @label = $cust_svc->label_long( $$sdate, $last_bill );
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];
my $svc_details = $label[0]. ': '. $label[1]. ': ';
$part_svc_label{$cust_svc->svcpart} ||= $label[0];
@@
-100,10
+107,13
@@
sub calc_recur {
}
}
}
}
- sprintf('%.2f', $self->base_recur($cust_pkg, $sdate) + $total_svc_charge );
-}
+ my $charge = $self->base_recur($cust_pkg, $sdate) + $total_svc_charge;
-sub can_discount { 0; }
+ $param->{'override_charges'} = $total_svc_charge / $self->freq;
+ my $discount = $self->calc_discount($cust_pkg, $sdate, $details, $param);
+
+ sprintf('%.2f', $charge - $discount );
+}
sub hide_svc_detail { 1; }
sub hide_svc_detail { 1; }
@@
-111,5
+121,7
@@
sub is_free_options {
qw( setup_fee recur_fee svc_setup_fee svc_recur_fee );
}
qw( setup_fee recur_fee svc_setup_fee svc_recur_fee );
}
+sub can_usageprice { 0; }
+
1;
1;