more datavolume format

3 files changed, 31 insertions, 11 deletions

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index ad73aaf55..c24917749 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -580,14 +580,14 @@ sub list_svcs {
                             'username'  => $svc_x->username,
                             'email'     => $svc_x->email,
                             'seconds'   => $svc_x->seconds,
-                            'upbytes'   => $svc_x->upbytes,
-                            'downbytes' => $svc_x->downbytes,
-                            'totalbytes'=> $svc_x->totalbytes,
+                            'upbytes'   => FS::UI::bytecount::display_bytecount($svc_x->upbytes),
+                            'downbytes' => FS::UI::bytecount::display_bytecount($svc_x->downbytes),
+                            'totalbytes'=> FS::UI::bytecount::display_bytecount($svc_x->totalbytes),
                             'recharge_amount' => $part_pkg->option('recharge_amount', 1),
                             'recharge_seconds' => $part_pkg->option('recharge_seconds', 1),
-                            'recharge_upbytes' => $part_pkg->option('recharge_upbytes', 1),
-                            'recharge_downbytes' => $part_pkg->option('recharge_downbytes', 1),
-                            'recharge_totalbytes' => $part_pkg->option('recharge_totalbytes', 1),
+                            'recharge_upbytes' => FS::UI::bytecount::display_bytecount($part_pkg->option('recharge_upbytes', 1)),
+                            'recharge_downbytes' => FS::UI::bytecount::display_bytecount($part_pkg->option('recharge_downbytes', 1)),
+                            'recharge_totalbytes' => FS::UI::bytecount::display_bytecount($part_pkg->option('recharge_totalbytes', 1)),
                             # more...
                           };
                         }
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 1e34ff03c..d94673b88 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -2485,8 +2485,12 @@ sub reached_threshold {
                         'last'      => $cust_main->getfield('last'),
                         'pkg'       => $cust_pkg->part_pkg->pkg,
                         'column'    => $opt{'column'},
-                        'amount'    => $svc_acct->getfield($opt{'column'}),
-                        'threshold' => $threshold,
+                        'amount'    => $opt{'column'} =~/bytes/
+                                       ? FS::UI::bytecount::display_bytecount($svc_acct->getfield($opt{'column'}))
+                                       : $svc_acct->getfield($opt{'column'}),
+                        'threshold' => $opt{'column'} =~/bytes/
+                                       ? FS::UI::bytecount::display_bytecount($threshold)
+                                       : $threshold,
                       } );
 
 
diff --git a/httemplate/misc/recharge_svc.html b/httemplate/misc/recharge_svc.html
index 9373b825c..634be0600 100755
--- a/httemplate/misc/recharge_svc.html
+++ b/httemplate/misc/recharge_svc.html
@@ -69,15 +69,31 @@ die "No such service: $svcnum" unless $cust_svc;
 $payby = $cust_svc->cust_pkg->cust_main->payby unless $payby;
 $part_pkg = $cust_svc->cust_pkg->part_pkg;
 $amount = $part_pkg->option('recharge_amount', 1) || 0;
+
 my $recharge_label = "Charge $money_char$amount for ";
+
 $recharge_label .= $part_pkg->option('recharge_seconds', 1) . 's '
   if $part_pkg->option('recharge_seconds', 1);
-$recharge_label .= $part_pkg->option('recharge_upbytes', 1) . ' up '
+
+
+$recharge_label .= FS::UI::bytecount::display_bytecount(
+                     $part_pkg->option('recharge_upbytes', 1) )
+                . ' up '
   if $part_pkg->option('recharge_upbytes', 1);
-$recharge_label .= $part_pkg->option('recharge_downbytes', 1) . ' down '
+
+
+$recharge_label .= FS::UI::bytecount::display_bytecount(
+                     $part_pkg->option('recharge_downbytes', 1) )
+                . ' down '
   if $part_pkg->option('recharge_downbytes', 1);
-$recharge_label .= $part_pkg->option('recharge_totalbytes', 1) . ' total '
+
+
+$recharge_label .= FS::UI::bytecount::display_bytecount(
+                     $part_pkg->option('recharge_totalbytes', 1) )
+                . ' total '
   if $part_pkg->option('recharge_totalbytes', 1);
+
+
 $recharge_label = ''
   unless ($recharge_label ne "Charge $money_char$amount for ");