[freeside-commits] branch FREESIDE_3_BRANCH updated. 4065dee1d04aa7ebd286a548c22455ce07b85340

[David F. Houghton]

The branch, FREESIDE_3_BRANCH has been updated
       via  4065dee1d04aa7ebd286a548c22455ce07b85340 (commit)
       via  8cfd5506cdf700e18f76f0bdff5fe5685144056e (commit)
       via  df8debf67bd9d24505854ebf2b93ebf095c3e8ea (commit)
      from  149719dd87d1f0d2208a94dcd7e9072c378d872a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4065dee1d04aa7ebd286a548c22455ce07b85340
Author: David Houghton <houghton at freeside.biz>
Date:   Wed Sep 10 15:52:31 2014 -0400

    ticket: 28287; adding parens to sprintf
    
    Mark didn't like the sprintf without parens, so I'm fixing it.

diff --git a/FS/FS/part_pkg/discount_Mixin.pm b/FS/FS/part_pkg/discount_Mixin.pm
index 3bff35a..0063567 100644
--- a/FS/FS/part_pkg/discount_Mixin.pm
+++ b/FS/FS/part_pkg/discount_Mixin.pm
@@ -183,7 +183,7 @@ sub calc_discount {
     }
 
     push @$details, $d;
-    push @$details, sprintf $format, $money_char, $br;
+    push @$details, sprintf( $format, $money_char, $br );
 
     $tot_discount += $amount;
   }

commit 8cfd5506cdf700e18f76f0bdff5fe5685144056e
Author: David Houghton <houghton at freeside.biz>
Date:   Wed Sep 10 10:16:54 2014 -0400

    ticket: 28287; rolling back mystery deletion
    
    I'm not sure how these two lines got ditched, but they're back.

diff --git a/FS/FS/part_pkg/discount_Mixin.pm b/FS/FS/part_pkg/discount_Mixin.pm
index 56c86d5..3bff35a 100644
--- 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 

commit df8debf67bd9d24505854ebf2b93ebf095c3e8ea
Author: David Houghton <houghton at freeside.biz>
Date:   Tue Sep 9 16:46:29 2014 -0400

    ticket: 28287; add undiscounted monthly amount
    
    I figured this need only parallel the discount report. That is, the discount
    only is reported and applied if the period of recurrence is some whole number
    of months. From my exploration of discounts it appeared that one could specify
    discounts for other periods, but they did not appear on invoices.

diff --git a/FS/FS/part_pkg/discount_Mixin.pm b/FS/FS/part_pkg/discount_Mixin.pm
index 1edf258..56c86d5 100644
--- a/FS/FS/part_pkg/discount_Mixin.pm
+++ b/FS/FS/part_pkg/discount_Mixin.pm
@@ -7,8 +7,6 @@ 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 
@@ -168,11 +166,22 @@ 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 each";
+      $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' : '' )
+	unless defined $param->{'setup_charge'};
+      $d .= ": $money_char$amount" if $months != 1 || $discount->percent;
+      $format = 'Undiscounted monthly amount: %s%.2f';
+    }
+
     push @$details, $d;
+    push @$details, sprintf $format, $money_char, $br;
 
     $tot_discount += $amount;
   }

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/part_pkg/discount_Mixin.pm |   19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)