diff options
| -rw-r--r-- | FS/FS/part_pkg/discount_Mixin.pm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/FS/FS/part_pkg/discount_Mixin.pm b/FS/FS/part_pkg/discount_Mixin.pm index 0063567dd..be0200c77 100644 --- 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' ) { - $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; - $d .= " for $months month". ( $months!=1 ? 's' : '' ) + $d .= " for $months months" 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'; } |