This commit was manufactured by cvs2svn to create tag 'freeside_2_1_0'.

[freeside.git] / FS / FS / tax_rate.pm

diff --git a/FS/FS/tax_rate.pm b/FS/FS/tax_rate.pm
index b375a66..87f2014 100644 (file)
--- a/FS/FS/tax_rate.pm
+++ b/FS/FS/tax_rate.pm
@@ -27,6 +27,8 @@ use FS::part_pkg_taxproduct;
 use FS::cust_main;
 use FS::Misc qw( csv_from_fixed );
 
+#i'd like to dump these
+use FS::CGI qw(rooturl popurl);
 use URI::Escape;
 
 @ISA = qw( FS::Record );
@@ -1765,21 +1767,17 @@ Launches a tax liability report.
 =cut
 
 sub queue_liability_report {
-  my $job = shift;
-  my $param = thaw(decode_base64(shift));
-
-  my $cgi = new CGI;
-  $cgi->param('beginning', $param->{beginning});
-  $cgi->param('ending', $param->{ending});
+  my $cgi = shift;
   my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
-  my $agentnum = $param->{agentnum};
+  my $agentnum = $cgi->param('agentnum');
   $agentnum =~ /^(\d+)$/ ? $agentnum = $1 : $agentnum = '';
-  generate_liability_report(
+  my $job = new FS::queue { job => 'FS::tax_rate::generate_liability_report' };
+  $job->insert(
     'beginning' => $beginning,
     'ending'    => $ending,
     'agentnum'  => $agentnum,
-    'p'         => $param->{RootURL},
-    'job'       => $job,
+    'p'         => popurl(2),
+    'rooturl'   => rooturl,
   );
 }
 
@@ -1793,8 +1791,6 @@ agentnum, beginning, and ending
 sub generate_liability_report {
   my %args = @_;
 
-  my ( $count, $last, $min_sec ) = _progressbar_foo();
-
   #let us open the temp file early
   my $dir = '%%%FREESIDE_CACHE%%%/cache.'. $FS::UID::datasrc;
   my $report = new File::Temp( TEMPLATE => 'report.tax.liability.XXXXXXXX',
@@ -1849,25 +1845,14 @@ sub generate_liability_report {
   my $credit = 0;
   my %taxes = ();
   my %basetaxes = ();
-  my $calculated = 0;
-  my @tax_and_location = qsearch({ table     => 'cust_bill_pkg',
-                                   select    => $select,
-                                   hashref   => { pkgpart => 0 },
-                                   addl_from => $addl_from,
-                                   extra_sql => $where,
-                                });
-  $count = scalar(@tax_and_location);
-  foreach my $t ( @tax_and_location ) {
-
-    if ( $args{job} ) {
-      if ( time - $min_sec > $last ) {
-        $args{job}->update_statustext( int( 100 * $calculated / $count ).
-                                       ",Calculated"
-                                     );
-        $last = time;
-      }
-    }
-
+  foreach my $t (qsearch({ table     => 'cust_bill_pkg',
+                           select    => $select,
+                           hashref   => { pkgpart => 0 },
+                           addl_from => $addl_from,
+                           extra_sql => $where,
+                        })
+                )
+  {
     my @params = map { my $f = $_; $f =~ s/.*\.//; $f } @taxparam;
     my $label = join('~', map { $t->$_ } @params);
     $label = 'Tax'. $label if $label =~ /^~/;
@@ -1922,12 +1907,6 @@ sub generate_liability_report {
 
 
   #ordering
-
-  if ( $args{job} ) {
-    $args{job}->update_statustext( "0,Sorted" );
-    $last = time;
-  }
-
   my @taxes = ();
 
   foreach my $tax ( sort { $a cmp $b } keys %taxes ) {
@@ -1989,19 +1968,8 @@ EOF
   my $bgcolor2 = '#ffffff';
   my $bgcolor = '';
  
-  $count = scalar(@taxes);
-  $calculated = 0;
   foreach my $tax ( @taxes ) {
  
-    if ( $args{job} ) {
-      if ( time - $min_sec > $last ) {
-        $args{job}->update_statustext( int( 100 * $calculated / $count ).
-                                       ",Generated"
-                                     );
-        $last = time;
-      }
-    }
-
     if ( $bgcolor eq $bgcolor1 ) {
       $bgcolor = $bgcolor2;
     } else {
@@ -2016,13 +1984,13 @@ EOF
     print $report <<EOF;
       <TR>
         <TD CLASS="grid" BGCOLOR="<% '$bgcolor' %>"><% '$tax->{label}' %></TD>
-        <% ($tax->{base}) ? qq!<TD CLASS="grid" BGCOLOR="$bgcolor"></TD>! : '' %>
+        <% $tax->{base} ? qq!<TD CLASS="grid" BGCOLOR="$bgcolor"></TD>! : '' %>
         <TD CLASS="grid" BGCOLOR="<% '$bgcolor' %>" ALIGN="right">
           <A HREF="<% '$baselink$link' %>;istax=1"><% '$money_char' %><% sprintf('%.2f', $tax->{'tax'} ) %></A>
         </TD>
         <% !($tax->{base}) ? qq!<TD CLASS="grid" BGCOLOR="$bgcolor"></TD>! : '' %>
         <TD CLASS="grid" BGCOLOR="<% '$bgcolor' %>"></TD>
-        <% ($tax->{base}) ? qq!<TD CLASS="grid" BGCOLOR="$bgcolor"></TD>! : '' %>
+        <% $tax->{base} ? qq!<TD CLASS="grid" BGCOLOR="$bgcolor"></TD>! : '' %>
         <TD CLASS="grid" BGCOLOR="<% '$bgcolor' %>" ALIGN="right">
           <A HREF="<% '$baselink$link' %>;istax=1;iscredit=rate"><% '$money_char' %><% sprintf('%.2f', $tax->{'credit'} ) %></A>
         </TD>
@@ -2044,7 +2012,7 @@ EOF
   my $dropstring = '%%%FREESIDE_CACHE%%%/cache.'. $FS::UID::datasrc. '/report.';
   $reportname =~ s/^$dropstring//;
 
-  my $reporturl = "%%%ROOTURL%%%/misc/queued_report?report=$reportname";
+  my $reporturl = $args{rooturl}. "/misc/queued_report?report=$reportname";
   die "<a href=$reporturl>view</a>\n";
 
 }