projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4604b94
)
FS RT #27189 - only printing 'each' if package quantity > 1 ; removed now-obsolete...
author
C.J. Adams-Collier
<cjac@colliertech.org>
Thu, 11 Sep 2014 20:14:50 +0000
(13:14 -0700)
committer
C.J. Adams-Collier
<cjac@colliertech.org>
Thu, 11 Sep 2014 20:14:50 +0000
(13:14 -0700)
FS/FS/part_pkg/discount_Mixin.pm
patch
|
blob
|
history
diff --git
a/FS/FS/part_pkg/discount_Mixin.pm
b/FS/FS/part_pkg/discount_Mixin.pm
index
0063567
..
be0200c
100644
(file)
--- a/
FS/FS/part_pkg/discount_Mixin.pm
+++ b/
FS/FS/part_pkg/discount_Mixin.pm
@@
-171,14
+171,15
@@
sub calc_discount {
my $format;
if ( $months eq '1' ) {
my $format;
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;
$format = 'Undiscounted amount: %s%.2f';
} 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';
}
$format = 'Undiscounted monthly amount: %s%.2f';
}