X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=FS%2FFS%2Fpart_pkg%2Fdiscount_Mixin.pm;h=50b331236121ed9ad82562f03fbeae26b9b8bec0;hb=e3605caefb645133c84856c7ebc3c40dbc4ec771;hp=be0200c77c3e5de2ad945f0bd5d6ec6629b3b3bc;hpb=c66ef7dd60e056e1c0ed53cdd239ef1ce7b3bbea;p=freeside.git

diff --git a/FS/FS/part_pkg/discount_Mixin.pm b/FS/FS/part_pkg/discount_Mixin.pm
index be0200c77..50b331236 100644
--- a/FS/FS/part_pkg/discount_Mixin.pm
+++ b/FS/FS/part_pkg/discount_Mixin.pm
@@ -32,7 +32,7 @@ sub calc_recur {
 
 Takes all the arguments of calc_recur.  Calculates and returns  the amount 
 by which to reduce the recurring fee; also increments months used on the 
-discount and generates an invoice detail describing it.
+discount.
 
 =cut
 
@@ -164,29 +164,32 @@ sub calc_discount {
     push @{ $param->{'discounts'} }, $cust_bill_pkg_discount;
 
     #add details on discount to invoice
-    my $money_char = $conf->config('money_char') || '$';
-    $months = sprintf('%.2f', $months) if $months =~ /\./;
-
-    my $d = 'Includes ';
-    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;
+    # no longer! this is now done during rendering based on the existence
+    # of the cust_bill_pkg_discount record
+    #
+    #my $money_char = $conf->config('money_char') || '$';
+    #$months = sprintf('%.2f', $months) if $months =~ /\./;
+
+    #my $d = 'Includes ';
+    #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;
   }
 
   sprintf('%.2f', $tot_discount);