projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0ed3aa3
)
add formatting to plan data
author
jeff
<jeff>
Tue, 8 May 2007 22:43:27 +0000
(22:43 +0000)
committer
jeff
<jeff>
Tue, 8 May 2007 22:43:27 +0000
(22:43 +0000)
FS/FS/part_pkg/prorate.pm
patch
|
blob
|
history
FS/FS/part_pkg/subscription.pm
patch
|
blob
|
history
diff --git
a/FS/FS/part_pkg/prorate.pm
b/FS/FS/part_pkg/prorate.pm
index
7ce7364
..
0c264e0
100644
(file)
--- a/
FS/FS/part_pkg/prorate.pm
+++ b/
FS/FS/part_pkg/prorate.pm
@@
-29,12
+29,18
@@
use FS::part_pkg::flat;
},
'upbytes' => { 'name' => 'Upload limit for this package',
'default' => '',
},
'upbytes' => { 'name' => 'Upload limit for this package',
'default' => '',
+ 'format' => \&FS::UI::bytecount::display_bytecount,
+ 'parse' => \&FS::UI::bytecount::parse_bytecount,
},
'downbytes' => { 'name' => 'Download limit for this package',
'default' => '',
},
'downbytes' => { 'name' => 'Download limit for this package',
'default' => '',
+ 'format' => \&FS::UI::bytecount::display_bytecount,
+ 'parse' => \&FS::UI::bytecount::parse_bytecount,
},
'totalbytes' => { 'name' => 'Transfer limit for this package',
'default' => '',
},
'totalbytes' => { 'name' => 'Transfer limit for this package',
'default' => '',
+ 'format' => \&FS::UI::bytecount::display_bytecount,
+ 'parse' => \&FS::UI::bytecount::parse_bytecount,
},
'recharge_amount' => { 'name' => 'Cost of recharge for this package',
'default' => '',
},
'recharge_amount' => { 'name' => 'Cost of recharge for this package',
'default' => '',
@@
-44,10
+50,16
@@
use FS::part_pkg::flat;
},
'recharge_upbytes' => { 'name' => 'Recharge upload for this package',
'default' => '',
},
'recharge_upbytes' => { 'name' => 'Recharge upload for this package',
'default' => '',
+ 'format' => \&FS::UI::bytecount::display_bytecount,
+ 'parse' => \&FS::UI::bytecount::parse_bytecount,
},
'recharge_downbytes' => { 'name' => 'Recharge download for this package', 'default' => '',
},
'recharge_downbytes' => { 'name' => 'Recharge download for this package', 'default' => '',
+ 'format' => \&FS::UI::bytecount::display_bytecount,
+ 'parse' => \&FS::UI::bytecount::parse_bytecount,
},
'recharge_totalbytes' => { 'name' => 'Recharge transfer for this package', 'default' => '',
},
'recharge_totalbytes' => { 'name' => 'Recharge transfer for this package', 'default' => '',
+ 'format' => \&FS::UI::bytecount::display_bytecount,
+ 'parse' => \&FS::UI::bytecount::parse_bytecount,
},
#it would be better if this had to be turned on, its confusing
'externalid' => { 'name' => 'Optional External ID',
},
#it would be better if this had to be turned on, its confusing
'externalid' => { 'name' => 'Optional External ID',
diff --git
a/FS/FS/part_pkg/subscription.pm
b/FS/FS/part_pkg/subscription.pm
index
db04842
..
0ed9782
100644
(file)
--- a/
FS/FS/part_pkg/subscription.pm
+++ b/
FS/FS/part_pkg/subscription.pm
@@
-25,12
+25,18
@@
use FS::part_pkg::flat;
},
'upbytes' => { 'name' => 'Upload limit for this package',
'default' => '',
},
'upbytes' => { 'name' => 'Upload limit for this package',
'default' => '',
+ 'format' => \&FS::UI::bytecount::display_bytecount,
+ 'parse' => \&FS::UI::bytecount::parse_bytecount,
},
'downbytes' => { 'name' => 'Download limit for this package',
'default' => '',
},
'downbytes' => { 'name' => 'Download limit for this package',
'default' => '',
+ 'format' => \&FS::UI::bytecount::display_bytecount,
+ 'parse' => \&FS::UI::bytecount::parse_bytecount,
},
'totalbytes' => { 'name' => 'Transfer limit for this package',
'default' => '',
},
'totalbytes' => { 'name' => 'Transfer limit for this package',
'default' => '',
+ 'format' => \&FS::UI::bytecount::display_bytecount,
+ 'parse' => \&FS::UI::bytecount::parse_bytecount,
},
'recharge_amount' => { 'name' => 'Cost of recharge for this package',
'default' => '',
},
'recharge_amount' => { 'name' => 'Cost of recharge for this package',
'default' => '',
@@
-40,10
+46,16
@@
use FS::part_pkg::flat;
},
'recharge_upbytes' => { 'name' => 'Recharge upload for this package',
'default' => '',
},
'recharge_upbytes' => { 'name' => 'Recharge upload for this package',
'default' => '',
+ 'format' => \&FS::UI::bytecount::display_bytecount,
+ 'parse' => \&FS::UI::bytecount::parse_bytecount,
},
'recharge_downbytes' => { 'name' => 'Recharge download for this package', 'default' => '',
},
'recharge_downbytes' => { 'name' => 'Recharge download for this package', 'default' => '',
+ 'format' => \&FS::UI::bytecount::display_bytecount,
+ 'parse' => \&FS::UI::bytecount::parse_bytecount,
},
'recharge_totalbytes' => { 'name' => 'Recharge transfer for this package', 'default' => '',
},
'recharge_totalbytes' => { 'name' => 'Recharge transfer for this package', 'default' => '',
+ 'format' => \&FS::UI::bytecount::display_bytecount,
+ 'parse' => \&FS::UI::bytecount::parse_bytecount,
},
#it would be better if this had to be turned on, its confusing
'externalid' => { 'name' => 'Optional External ID',
},
#it would be better if this had to be turned on, its confusing
'externalid' => { 'name' => 'Optional External ID',