summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Kohler <ivan@freeside.biz>2013-11-09 13:00:02 -0800
committerIvan Kohler <ivan@freeside.biz>2013-11-09 13:00:02 -0800
commita60a4b806ce280ed589199fcfe0cc20824b43fa5 (patch)
tree6a9c40df4ee9b4910a34c5fd9b889dd9a072ff31
parentb67aa7e32eddd8d67d53ef534a4803f1162f2cca (diff)
discounts with bulk packages, RT#24655
-rw-r--r--FS/FS/part_pkg/bulk_Common.pm9
1 files changed, 6 insertions, 3 deletions
diff --git a/FS/FS/part_pkg/bulk_Common.pm b/FS/FS/part_pkg/bulk_Common.pm
index 67a683a12..50115958e 100644
--- a/FS/FS/part_pkg/bulk_Common.pm
+++ b/FS/FS/part_pkg/bulk_Common.pm
@@ -100,10 +100,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;
+
+ $param->{'override_charges'} = $total_svc_charge / $self->freq;
+ my $discount = $self->calc_discount($cust_pkg, $sdate, $details, $param);
-sub can_discount { 0; }
+ sprintf('%.2f', $charge - $discount );
+}
sub hide_svc_detail { 1; }