From 86ba66f385625b57c8d06a6beb3c63f6f452a29f Mon Sep 17 00:00:00 2001 From: "C.J. Adams-Collier" Date: Thu, 11 Sep 2014 13:14:50 -0700 Subject: [PATCH] FS RT #27189 - only printing 'each' if package quantity > 1 ; removed now-obsolete checks for pluralization of 'month' --- FS/FS/part_pkg/discount_Mixin.pm | 7 ++++--- 1 file 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'; } -- 2.11.0