[freeside-commits] branch FREESIDE_3_BRANCH updated. 31b49b580727c2c9dca516b9ccbb67b10e6d0fcf

[Ivan]

The branch, FREESIDE_3_BRANCH has been updated
       via  31b49b580727c2c9dca516b9ccbb67b10e6d0fcf (commit)
      from  2e3ee9e645776e6f6ff49127e649dcddd595b936 (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 31b49b580727c2c9dca516b9ccbb67b10e6d0fcf
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Jun 11 23:07:07 2013 -0700

    fix discounts w/quantities, RT#23530

diff --git a/FS/FS/part_pkg/flat.pm b/FS/FS/part_pkg/flat.pm
index 22eb698..757e1ce 100644
--- a/FS/FS/part_pkg/flat.pm
+++ b/FS/FS/part_pkg/flat.pm
@@ -120,9 +120,7 @@ sub calc_setup {
     push @$details, $self->option( 'additional_info' . $i++ );
   }
 
-  my $quantity = $cust_pkg->quantity || 1;
-
-  my $charge = $quantity * $self->unit_setup($cust_pkg, $sdate, $details);
+  my $charge = $self->unit_setup($cust_pkg, $sdate, $details);
 
   my $discount = 0;
   if ( $charge > 0 ) {
@@ -131,7 +129,7 @@ sub calc_setup {
       delete $param->{'setup_charge'};
   }
 
-  sprintf('%.2f', $charge - $discount);
+  sprintf( '%.2f', ($cust_pkg->quantity || 1) * ($charge - $discount) );
 }
 
 sub unit_setup {
@@ -162,11 +160,9 @@ sub calc_recur {
     $charge *= $param->{freq_override} if $param->{freq_override};
   }
 
-  my $quantity = $cust_pkg->quantity || 1;
-  $charge *= $quantity;
-
   my $discount = $self->calc_discount($cust_pkg, $sdate, $details, $param);
-  return sprintf('%.2f', $charge - $discount);
+
+  sprintf( '%.2f', ($cust_pkg->quantity || 1) * ($charge - $discount) );
 }
 
 sub cutoff_day {

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

Summary of changes:
 FS/FS/part_pkg/flat.pm |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)