diff options
| author | jeff <jeff> | 2007-12-23 22:05:54 +0000 |
|---|---|---|
| committer | jeff <jeff> | 2007-12-23 22:05:54 +0000 |
| commit | a35faaccc20e2214d91876744c45322a3a220bb5 (patch) | |
| tree | 8a4a092bb292b71d59a194c6e4cccfa47630602c /FS | |
| parent | a6ae5144ce937bf2a86734543f4ea396758e07fb (diff) | |
add a reset feature to manual recharges (#1858)
Diffstat (limited to 'FS')
| -rw-r--r-- | FS/FS/part_pkg/flat.pm | 6 | ||||
| -rw-r--r-- | FS/FS/part_pkg/prorate.pm | 7 | ||||
| -rw-r--r-- | FS/FS/part_pkg/subscription.pm | 13 |
3 files changed, 17 insertions, 9 deletions
diff --git a/FS/FS/part_pkg/flat.pm b/FS/FS/part_pkg/flat.pm index f5ccd0119..92e72cf8a 100644 --- a/FS/FS/part_pkg/flat.pm +++ b/FS/FS/part_pkg/flat.pm @@ -76,12 +76,16 @@ use FS::part_pkg; ' over into current period', 'type' => 'checkbox', }, + 'recharge_reset' => { 'name' => 'Reset usage to these values on manual '. + 'package recharge', + 'type' => 'checkbox', + }, }, 'fieldorder' => [ 'setup_fee', 'recur_fee', 'unused_credit', 'seconds', 'upbytes', 'downbytes', 'totalbytes', 'recharge_amount', 'recharge_seconds', 'recharge_upbytes', 'recharge_downbytes', 'recharge_totalbytes', - 'usage_rollover', 'externalid' ], + 'usage_rollover', 'recharge_reset', 'externalid' ], 'weight' => 10, ); diff --git a/FS/FS/part_pkg/prorate.pm b/FS/FS/part_pkg/prorate.pm index 3dfab37ba..45bbf0153 100644 --- a/FS/FS/part_pkg/prorate.pm +++ b/FS/FS/part_pkg/prorate.pm @@ -74,6 +74,11 @@ use FS::part_pkg::flat; 'over into current period', 'type' => 'checkbox', }, + 'recharge_reset' => { 'name' => 'Reset usage to these values on manual '. + 'package recharge', + 'type' => 'checkbox', + }, + #it would be better if this had to be turned on, its confusing 'externalid' => { 'name' => 'Optional External ID', 'default' => '', @@ -83,7 +88,7 @@ use FS::part_pkg::flat; 'seconds', 'upbyte', 'downbytes', 'totalbytes', 'recharge_amount', 'recharge_seconds', 'recharge_upbytes', 'recharge_downbytes', 'recharge_totalbytes', - 'usage_rollover', 'externalid', ], + 'usage_rollover', 'recharge_reset', 'externalid', ], 'freq' => 'm', 'weight' => 20, ); diff --git a/FS/FS/part_pkg/subscription.pm b/FS/FS/part_pkg/subscription.pm index 3e5a41669..c9c472c2d 100644 --- a/FS/FS/part_pkg/subscription.pm +++ b/FS/FS/part_pkg/subscription.pm @@ -70,6 +70,11 @@ use FS::part_pkg::flat; 'over into current period', 'type' => 'checkbox', }, + 'recharge_reset' => { 'name' => 'Reset usage to these values on manual '. + 'package recharge', + 'type' => 'checkbox', + }, + #it would be better if this had to be turned on, its confusing 'externalid' => { 'name' => 'Optional External ID', 'default' => '', @@ -79,13 +84,7 @@ use FS::part_pkg::flat; 'upbytes', 'downbytes', 'totalbytes', 'recharge_amount', 'recharge_seconds', 'recharge_upbytes', 'recharge_downbytes', 'recharge_totalbytes', - 'externalid' ], - 'fieldorder' => [ 'setup_fee', 'recur_fee','cutoff_day', 'seconds', - 'upbytes', 'downbytes', 'totalbytes', - 'recharge_amount', 'recharge_seconds', 'recharge_upbytes', - 'recharge_downbytes', 'recharge_totalbytes', - 'usage_rollover', - ], + 'usage_rollover', 'recharge_reset', 'externalid' ], 'freq' => 'm', 'weight' => 30, ); |