X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fdiscount_Mixin.pm;h=be0200c77c3e5de2ad945f0bd5d6ec6629b3b3bc;hb=ab6e4f9b42a6e7fe2031ad5f2443ef6a3584be1e;hp=335ff6d0f7fda250811057de3188d637085190f5;hpb=5c4da92af240d4a5d7f39e2478e344693817d5b7;p=freeside.git

diff --git a/FS/FS/part_pkg/discount_Mixin.pm b/FS/FS/part_pkg/discount_Mixin.pm
index 335ff6d0f..be0200c77 100644
--- a/FS/FS/part_pkg/discount_Mixin.pm
+++ b/FS/FS/part_pkg/discount_Mixin.pm
@@ -84,7 +84,9 @@ sub calc_discount {
     $amount += $discount->amount
         if $cust_pkg->pkgpart == $param->{'real_pkgpart'};
     $amount += sprintf('%.2f', $discount->percent * $br / 100 );
-    my $chg_months = $param->{'months'} || $cust_pkg->part_pkg->freq;
+    my $chg_months = defined($param->{'months'}) ?
+                      $param->{'months'} :
+                      $cust_pkg->part_pkg->freq;
 
     my $months = $discount->months
     ? min( $chg_months,
@@ -166,11 +168,23 @@ sub calc_discount {
     $months = sprintf('%.2f', $months) if $months =~ /\./;
 
     my $d = 'Includes ';
-    $d .= 'setup ' if defined $param->{'setup_charge'};
-    $d .= 'discount of '. $discount->description_short;
-    $d .= " for $months month". ( $months!=1 ? 's' : '' ) unless defined $param->{'setup_charge'};
-    $d .= ": $money_char$amount" if $months != 1 || $discount->percent;
+    my $format;
+
+    if ( $months eq '1' ) {
+      $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 months"
+	unless defined $param->{'setup_charge'};
+      $d .= ": $money_char$amount" if $discount->percent;
+      $format = 'Undiscounted monthly amount: %s%.2f';
+    }
+
     push @$details, $d;
+    push @$details, sprintf( $format, $money_char, $br );
 
     $tot_discount += $amount;
   }