projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FS RT #27189 - only printing 'each' if package quantity > 1 ; removed now-obsolete...
[freeside.git]
/
FS
/
FS
/
part_pkg
/
discount_Mixin.pm
diff --git
a/FS/FS/part_pkg/discount_Mixin.pm
b/FS/FS/part_pkg/discount_Mixin.pm
index
48ca94d
..
be0200c
100644
(file)
--- a/
FS/FS/part_pkg/discount_Mixin.pm
+++ b/
FS/FS/part_pkg/discount_Mixin.pm
@@
-168,18
+168,23
@@
sub calc_discount {
$months = sprintf('%.2f', $months) if $months =~ /\./;
my $d = 'Includes ';
$months = sprintf('%.2f', $months) if $months =~ /\./;
my $d = 'Includes ';
+ my $format;
if ( $months eq '1' ) {
if ( $months eq '1' ) {
- $d .= "discount of $money_char$amount each";
+ $d .= "discount of $money_char$amount";
+ $d .= " each" if $cust_pkg->quantity > 1;
+ $format = 'Undiscounted amount: %s%.2f';
} else {
$d .= 'setup ' if defined $param->{'setup_charge'};
$d .= 'discount of '. $discount->description_short;
} else {
$d .= 'setup ' if defined $param->{'setup_charge'};
$d .= 'discount of '. $discount->description_short;
- $d .= " for $months month
". ( $months!=1 ? 's' : '' )
+ $d .= " for $months month
s"
unless defined $param->{'setup_charge'};
unless defined $param->{'setup_charge'};
- $d .= ": $money_char$amount" if $months != 1 || $discount->percent;
+ $d .= ": $money_char$amount" if $discount->percent;
+ $format = 'Undiscounted monthly amount: %s%.2f';
}
push @$details, $d;
}
push @$details, $d;
+ push @$details, sprintf( $format, $money_char, $br );
$tot_discount += $amount;
}
$tot_discount += $amount;
}