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 56c86d5..be0200c 100644 (file)
--- a/FS/FS/part_pkg/discount_Mixin.pm
+++ b/FS/FS/part_pkg/discount_Mixin.pm
@@ -7,6 +7,8 @@ use List::Util  qw( min );
 use FS::cust_pkg;
 use FS::cust_bill_pkg_discount;
 
+%info = ( 'disabled' => 1 );
+
 =head1 NAME
 
 FS::part_pkg::discount_Mixin - Mixin class for part_pkg:: classes that 
@@ -169,19 +171,20 @@ 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';
     }
 
     push @$details, $d;
-    push @$details, sprintf $format, $money_char, $br;
+    push @$details, sprintf( $format, $money_char, $br );
 
     $tot_discount += $amount;
   }