bug squashing for multiple usage classes

4 files changed, 28 insertions, 14 deletions

diff --git a/FS/FS/cust_bill_pkg.pm b/FS/FS/cust_bill_pkg.pm
index b481e92a7..6925de8b3 100644
--- a/FS/FS/cust_bill_pkg.pm
+++ b/FS/FS/cust_bill_pkg.pm
@@ -139,7 +139,7 @@ sub insert {
       'billpkgnum' => $self->billpkgnum,
       'format'     => (ref($detail) ? $detail->[0] : '' ),
       'detail'     => (ref($detail) ? $detail->[1] : $detail ),
-      'charge'     => (ref($detail) ? $detail->[2] : '' ),
+      'amount'     => (ref($detail) ? $detail->[2] : '' ),
       'classnum'   => (ref($detail) ? $detail->[3] : '' ),
     };
     $error = $cust_bill_pkg_detail->insert;
@@ -481,13 +481,13 @@ sub usage {
     @values = 
       map { $_->[2] }
       grep { ref($_) && ( defined($classnum) ? $_->[3] eq $classnum : 1 ) }
-      $self->get('details');
+      @{ $self->get('details') };
 
   }else{
 
     my $hashref = { 'billpkgnum' => $self->billpkgnum };
     $hashref->{ 'classnum' } = $classnum if defined($classnum);
-    @values = map { $_->charge } qsearch('cust_bill_pkg_detail', $hashref);
+    @values = map { $_->amount } qsearch('cust_bill_pkg_detail', $hashref);
 
   }
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 9e501238c..718fccf2f 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -2542,7 +2542,8 @@ sub _handle_taxes {
     : '';
 
   my @classes;
-  push @classes, $cust_bill_pkg->usage_classes if $cust_bill_pkg->type eq 'U';
+  #push @classes, $cust_bill_pkg->usage_classes if $cust_bill_pkg->type eq 'U';
+  push @classes, $cust_bill_pkg->usage_classes if $cust_bill_pkg->usage;
   push @classes, 'setup' if $cust_bill_pkg->setup;
   push @classes, 'recur' if $cust_bill_pkg->recur;
 
@@ -2610,32 +2611,40 @@ sub _handle_taxes {
     my $cust_bill_pkg_recur = new FS::cust_bill_pkg { $cust_bill_pkg->hash };
     $cust_bill_pkg->set('details', []);
     $cust_bill_pkg->recur(0);
+    $cust_bill_pkg->unitrecur(0);
     $cust_bill_pkg->type('');
+    $cust_bill_pkg_recur->setup(0);
+    $cust_bill_pkg_recur->unitsetup(0);
     $cust_bill_pkg{recur} = $cust_bill_pkg_recur;
   }
 
   #split usage from recur
-  my $usage = $cust_bill_pkg->usage;
+  my $usage = sprintf( "%.2f", $cust_bill_pkg{recur}->usage );
+  warn "usage is $usage\n" if $DEBUG;
   if ($usage) {
     my $cust_bill_pkg_usage =
         new FS::cust_bill_pkg { $cust_bill_pkg{recur}->hash };
-    $cust_bill_pkg_usage->recur($usage);
-    $cust_bill_pkg{recur}->recur( $cust_bill_pkg{recur}->recur - $usage );
+    $cust_bill_pkg_usage->recur( $usage );
+    $cust_bill_pkg_usage->type( 'U' );
+    my $recur = sprintf( "%.2f", $cust_bill_pkg{recur}->recur - $usage );
+    $cust_bill_pkg{recur}->recur( $recur );
     $cust_bill_pkg{recur}->type( '' );
+    $cust_bill_pkg{recur}->set('details', []);
     $cust_bill_pkg{''} = $cust_bill_pkg_usage;
   }
 
   #subdivide usage by usage_class
   if (exists($cust_bill_pkg{''})) {
-    foreach my $class (grep {$_} @classes) {
-      my $usage = $cust_bill_pkg{''}->usage($class);
+    foreach my $class (grep {$_ && $_ ne 'setup' && $_ ne 'recur' } @classes) {
+      my $usage = sprintf( "%.2f", $cust_bill_pkg{''}->usage($class) );
       my $cust_bill_pkg_usage =
           new FS::cust_bill_pkg { $cust_bill_pkg{''}->hash };
-      $cust_bill_pkg_usage->recur($usage);
-      $cust_bill_pkg{''}->recur( $cust_bill_pkg{''}->recur - $usage );
+      $cust_bill_pkg_usage->recur( $usage );
+      $cust_bill_pkg_usage->set('details', []);
+      my $classless = sprintf( "%.2f", $cust_bill_pkg{''}->recur - $usage );
+      $cust_bill_pkg{''}->recur( $classless );
       $cust_bill_pkg{$class} = $cust_bill_pkg_usage;
     }
-    $cust_bill_pkg{''}->set('details', []);
     delete $cust_bill_pkg{''} unless $cust_bill_pkg{''}->recur;
   }
 
diff --git a/FS/FS/tax_rate.pm b/FS/FS/tax_rate.pm
index e0f98afd3..bfb9c8c32 100644
--- a/FS/FS/tax_rate.pm
+++ b/FS/FS/tax_rate.pm
@@ -397,7 +397,12 @@ sub taxline {
   my $taxable_units = 0;
   unless ($self->recurtax =~ /^Y$/i) {
     if ($self->unittype == 0) {
-      $taxable_units += $_->units foreach @cust_bill_pkg;
+      my %seen = ();
+      foreach (@cust_bill_pkg) {
+        $taxable_units += $_->units
+          unless $seen{$_->pkgnum};
+        $seen{$_->pkgnum}++;
+      }
     }elsif ($self->unittype == 1) {
       return qq!fatal: can't (yet) handle fee with minute unit type!;
     }elsif ($self->unittype == 2) {
diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi
index d338b8299..669b75946 100755
--- a/httemplate/edit/process/part_pkg.cgi
+++ b/httemplate/edit/process/part_pkg.cgi
@@ -164,7 +164,7 @@ foreach my $override_class ($cgi->param) {
     'link_table'   => 'part_pkg_taxoverride',
     'target_table' => 'tax_class',
     'hashref'      => { 'usage_class' => $class },
-    'params'       => \@tax_overrides,
+    'params'       => [ @tax_overrides ],
   };
 
 }