[freeside-commits] freeside/httemplate/misc recharge_svc.html, 1.1.2.1, 1.1.2.2

[Jeff Finucane,420,,]

Update of /home/cvs/cvsroot/freeside/httemplate/misc
In directory wavetail:/tmp/cvs-serv14726/httemplate/misc

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	recharge_svc.html 
Log Message:
more datavolume format (backport)

Index: recharge_svc.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/misc/recharge_svc.html,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- recharge_svc.html	9 Apr 2007 23:39:57 -0000	1.1.2.1
+++ recharge_svc.html	26 Apr 2007 04:47:16 -0000	1.1.2.2
@@ -69,15 +69,31 @@
 $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 ");