[freeside-commits] branch FREESIDE_3_BRANCH updated. 4de6188bbcf33e2793be4f95a48d79fd36699067

[Ivan]

The branch, FREESIDE_3_BRANCH has been updated
       via  4de6188bbcf33e2793be4f95a48d79fd36699067 (commit)
      from  1437b733f6e2a2b7740a04ea5f56ebc62809f4e0 (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 4de6188bbcf33e2793be4f95a48d79fd36699067
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Aug 11 21:38:19 2014 -0700

    fix status page

diff --git a/httemplate/view/Status.html b/httemplate/view/Status.html
index 38452b9..2ddf7e5 100644
--- a/httemplate/view/Status.html
+++ b/httemplate/view/Status.html
@@ -106,11 +106,6 @@ if ( _is_running('cdrd') ) {
                         $s. 's';
 
   }
-  $status{'CDR Processing'} = [
-    { 'title' => 'Current processing delay',
-      'value' => $delay,
-    },
-  ];
 
   my $pr_delay = FS::Record->scalar_sql('
     SELECT AVG(end_date-start_date)
@@ -129,11 +124,6 @@ if ( _is_running('cdrd') ) {
                            $s. 's';
 
   }
-  $status{'CDR Processing'} = [
-    { 'title' => 'Average billing time',
-      'value' => $pr_delay,
-    },
-  ];
 
   my $dayago = time2str('%Y-%m-%d %X', time - 86400);
   my $cdrs = FS::Record->scalar_sql(qq{
@@ -141,7 +131,14 @@ if ( _is_running('cdrd') ) {
       WHERE ( freesidestatus IS NULL OR freesidestatus = '' )
         AND calldate > '$dayago'
   });
+
   $status{'CDR Processing'} = [
+    { 'title' => 'Current processing delay',
+      'value' => $delay,
+    },
+    { 'title' => 'Average billing time',
+      'value' => $pr_delay,
+    },
     { 'title' => 'Unprocessed CDRs (last 24 hours)',
       'value' => $cdrs,
     },

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

Summary of changes:
 httemplate/view/Status.html |   17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)