[freeside-commits] freeside/httemplate/edit/process svc_acct.cgi, 1.7.2.1, 1.7.2.2 prepay_credit.cgi, 1.5, 1.5.2.1

[Jeff Finucane,420,,]

Update of /home/cvs/cvsroot/freeside/httemplate/edit/process
In directory wavetail:/tmp/cvs-serv12212/httemplate/edit/process

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	svc_acct.cgi prepay_credit.cgi 
Log Message:
break _bytecount subroutines out of FS::UI::Web (backport)

Index: prepay_credit.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/process/prepay_credit.cgi,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- prepay_credit.cgi	7 Dec 2006 02:40:32 -0000	1.5
+++ prepay_credit.cgi	19 Apr 2007 23:38:33 -0000	1.5.2.1
@@ -49,9 +49,9 @@
   <% $hashref->{amount} ? sprintf('$%.2f', $hashref->{amount} ) : '' %>
   <% $hashref->{amount} && $hashref->{seconds} ? 'and' : '' %>
   <% $hashref->{seconds} ? duration_exact($hashref->{seconds}) : '' %>
-  <% $hashref->{upbytes}   ? FS::UI::Web::bytecount_unexact($hashref->{upbytes}) : '' %>
-  <% $hashref->{downbytes} ? FS::UI::Web::bytecount_unexact($hashref->{downbytes}) : '' %>
-  <% $hashref->{totalbytes} ? FS::UI::Web::bytecount_unexact($hashref->{totalbytes}) : '' %>
+  <% $hashref->{upbytes}   ? FS::UI::bytecount::bytecount_unexact($hashref->{upbytes}) : '' %>
+  <% $hashref->{downbytes} ? FS::UI::bytecount::bytecount_unexact($hashref->{downbytes}) : '' %>
+  <% $hashref->{totalbytes} ? FS::UI::bytecount::bytecount_unexact($hashref->{totalbytes}) : '' %>
   <br>
 % } 
 

Index: svc_acct.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/process/svc_acct.cgi,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -d -r1.7.2.1 -r1.7.2.2
--- svc_acct.cgi	12 Apr 2007 03:18:25 -0000	1.7.2.1
+++ svc_acct.cgi	19 Apr 2007 23:38:33 -0000	1.7.2.2
@@ -25,7 +25,7 @@
 %
 %#unmunge bytecounts
 %foreach (map { $_,$_."_threshold" } qw( upbytes downbytes totalbytes )) {
-%  $cgi->param($_, FS::UI::Web::parse_bytecount($cgi->param($_)) );
+%  $cgi->param($_, FS::UI::bytecount::parse_bytecount($cgi->param($_)) );
 %}
 %
 %my %hash = $svcnum ? $old->hash : ();