[freeside-commits] freeside/FS/FS CGI.pm, 1.43, 1.44 queue.pm, 1.26, 1.27 tax_rate.pm, 1.40, 1.41

[Jeff Finucane,420,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv24458/FS/FS

Modified Files:
	CGI.pm queue.pm tax_rate.pm 
Log Message:
add progressbar, redirection, and improve links RT#8274

Index: CGI.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/CGI.pm,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -w -d -r1.43 -r1.44
--- CGI.pm	12 Jul 2009 23:38:12 -0000	1.43
+++ CGI.pm	1 Jun 2010 19:58:26 -0000	1.44
@@ -227,9 +227,15 @@
 =cut
 
 sub rooturl {
+  my $url_string;
+  if ( scalar(@_) ) {
+    $url_string = shift;
+  } else {
   # better to start with the client-provided URL
   my $cgi = &FS::UID::cgi;
-  my $url_string = $cgi->isa('Apache') ? $cgi->uri : $cgi->url;
+    $url_string = $cgi->isa('Apache') ? $cgi->uri : $cgi->url;
+  }
+
   $url_string =~ s/\?.*//;
 
   #even though this is kludgy

Index: queue.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/queue.pm,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -w -d -r1.26 -r1.27
--- queue.pm	13 May 2010 05:43:22 -0000	1.26
+++ queue.pm	1 Jun 2010 19:58:27 -0000	1.27
@@ -67,6 +67,20 @@
 
 Freeform text status message
 
+=cut
+
+sub statustext {
+  my $self = shift;
+  if ( defined ( $_[0] ) ) {
+    $self->SUPER::statustext(@_);
+  } else {
+    my $value = $self->SUPER::statustext();
+    my $rooturl = rooturl();
+    $value =~ s/%%%ROOTURL%%%/$rooturl/g; 
+    $value;
+  }
+}
+
 =item _date
 
 UNIX timestamp
@@ -363,7 +377,7 @@
 use vars qw($_update_statustext_dbh);
 sub update_statustext {
   my( $self, $statustext ) = @_;
-  return '' if $statustext eq $self->statustext;
+  return '' if $statustext eq $self->get('statustext'); #avoid rooturl expansion
   warn "updating statustext for $self to $statustext" if $DEBUG;
 
   $_update_statustext_dbh ||= myconnect;
@@ -374,7 +388,7 @@
 
   $sth->execute($statustext, $self->jobnum) or return $sth->errstr;
   $_update_statustext_dbh->commit or die $_update_statustext_dbh->errstr;
-  $self->statustext($statustext);
+  $self->set('statustext', $statustext); #avoid rooturl expansion
   '';
 
   #my $new = new FS::queue { $self->hash };

Index: tax_rate.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/tax_rate.pm,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -w -d -r1.40 -r1.41
--- tax_rate.pm	26 May 2010 16:11:59 -0000	1.40
+++ tax_rate.pm	1 Jun 2010 19:58:27 -0000	1.41
@@ -27,8 +27,6 @@
 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 );
@@ -1767,17 +1765,21 @@
 =cut
 
 sub queue_liability_report {
-  my $cgi = shift;
+  my $job = shift;
+  my $param = thaw(decode_base64(shift));
+
+  my $cgi = new CGI;
+  $cgi->param('beginning', $param->{beginning});
+  $cgi->param('ending', $param->{ending});
   my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
-  my $agentnum = $cgi->param('agentnum');
+  my $agentnum = $param->{agentnum};
   $agentnum =~ /^(\d+)$/ ? $agentnum = $1 : $agentnum = '';
-  my $job = new FS::queue { job => 'FS::tax_rate::generate_liability_report' };
-  $job->insert(
+  generate_liability_report(
     'beginning' => $beginning,
     'ending'    => $ending,
     'agentnum'  => $agentnum,
-    'p'         => popurl(2),
-    'rooturl'   => rooturl,
+    'p'         => $param->{RootURL},
+    'job'       => $job,
   );
 }
 
@@ -1791,6 +1793,8 @@
 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',
@@ -1845,14 +1849,25 @@
   my $credit = 0;
   my %taxes = ();
   my %basetaxes = ();
-  foreach my $t (qsearch({ table     => 'cust_bill_pkg',
+  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;
+      }
+    }
+
     my @params = map { my $f = $_; $f =~ s/.*\.//; $f } @taxparam;
     my $label = join('~', map { $t->$_ } @params);
     $label = 'Tax'. $label if $label =~ /^~/;
@@ -1907,6 +1922,12 @@
 
 
   #ordering
+
+  if ( $args{job} ) {
+    $args{job}->update_statustext( "0,Sorted" );
+    $last = time;
+  }
+
   my @taxes = ();
 
   foreach my $tax ( sort { $a cmp $b } keys %taxes ) {
@@ -1968,8 +1989,19 @@
   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 {
@@ -2012,7 +2044,7 @@
   my $dropstring = '%%%FREESIDE_CACHE%%%/cache.'. $FS::UID::datasrc. '/report.';
   $reportname =~ s/^$dropstring//;
 
-  my $reporturl = $args{rooturl}. "/misc/queued_report?report=$reportname";
+  my $reporturl = "%%%ROOTURL%%%/misc/queued_report?report=$reportname";
   die "<a href=$reporturl>view</a>\n";
 
 }