[freeside-commits] freeside/FS/FS/part_pkg base_delayed.pm, 1.2, 1.3 base_rate.pm, 1.2, 1.3 bulk.pm, 1.2, 1.3 flat.pm, 1.21, 1.22 flat_comission.pm, 1.6, 1.7 flat_comission_cust.pm, 1.6, 1.7 flat_comission_pkg.pm, 1.5, 1.6 flat_delayed.pm, 1.6, 1.7 flat_introrate.pm, 1.1, 1.2 prepaid.pm, 1.3, 1.4 prorate.pm, 1.16, 1.17 prorate_delayed.pm, 1.1, 1.2 sesmon_hour.pm, 1.6, 1.7 sesmon_minute.pm, 1.7, 1.8 sql_external.pm, 1.6, 1.7 sql_generic.pm, 1.6, 1.7 sqlradacct_hour.pm, 1.7, 1.8 subscription.pm, 1.14, 1.15 voip_cdr.pm, 1.9, 1.10 voip_sqlradacct.pm, 1.18, 1.19
Ivan,,,
ivan at wavetail.420.am
Sun Apr 13 00:41:31 PDT 2008
Update of /home/cvs/cvsroot/freeside/FS/FS/part_pkg
In directory wavetail.420.am:/tmp/cvs-serv6472
Modified Files:
base_delayed.pm base_rate.pm bulk.pm flat.pm flat_comission.pm
flat_comission_cust.pm flat_comission_pkg.pm flat_delayed.pm
flat_introrate.pm prepaid.pm prorate.pm prorate_delayed.pm
sesmon_hour.pm sesmon_minute.pm sql_external.pm sql_generic.pm
sqlradacct_hour.pm subscription.pm voip_cdr.pm
voip_sqlradacct.pm
Log Message:
shorter names and rearranged weights for a brighter tommorow^W^Wbetter price plan <SELECT>
Index: flat.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/flat.pm,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- flat.pm 23 Dec 2007 22:05:54 -0000 1.21
+++ flat.pm 13 Apr 2008 07:41:28 -0000 1.22
@@ -10,6 +10,7 @@
%info = (
'name' => 'Flat rate (anniversary billing)',
+ 'shortname' => 'Anniversary',
'fields' => {
'setup_fee' => { 'name' => 'Setup fee for this package',
'default' => 0,
Index: prepaid.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/prepaid.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- prepaid.pm 22 Oct 2006 05:22:51 -0000 1.3
+++ prepaid.pm 13 Apr 2008 07:41:28 -0000 1.4
@@ -14,6 +14,8 @@
%info = (
'name' => 'Prepaid, flat rate',
+ #'name' => 'Prepaid (no automatic recurring)', #maybe use it here too
+ 'shortname' => 'Prepaid, no automatic cycle',
'fields' => {
'setup_fee' => { 'name' => 'One-time setup fee for this package',
'default' => 0,
Index: flat_comission_cust.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/flat_comission_cust.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- flat_comission_cust.pm 4 Dec 2007 18:20:58 -0000 1.6
+++ flat_comission_cust.pm 13 Apr 2008 07:41:28 -0000 1.7
@@ -9,6 +9,7 @@
%info = (
'name' => 'Flat rate with recurring commission per active customer',
+ 'shortname' => 'Commission per active customer',
'fields' => {
'setup_fee' => { 'name' => 'Setup fee for this package',
'default' => 0,
Index: flat_introrate.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/flat_introrate.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- flat_introrate.pm 29 Aug 2006 18:04:53 -0000 1.1
+++ flat_introrate.pm 13 Apr 2008 07:41:28 -0000 1.2
@@ -14,6 +14,7 @@
%info = (
'name' => 'Introductory price for X months, then flat rate,'.
'relative to setup date (anniversary billing)',
+ 'shortname' => 'Anniversary, with intro price',
'fields' => {
'setup_fee' => { 'name' => 'Setup fee for this package',
'default' => 0,
@@ -34,7 +35,7 @@
},
},
'fieldorder' => [ 'setup_fee', 'intro_duration', 'intro_fee', 'recur_fee', 'unused_credit' ],
- 'weight' => 150,
+ 'weight' => 14,
);
sub calc_recur {
Index: sesmon_hour.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/sesmon_hour.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- sesmon_hour.pm 19 Dec 2005 04:18:54 -0000 1.6
+++ sesmon_hour.pm 13 Apr 2008 07:41:28 -0000 1.7
@@ -9,6 +9,7 @@
%info = (
'name' => 'Base charge plus charge per-hour from the session monitor',
+ 'shortname' => 'Session monitor (per-hour)',
'fields' => {
'setup_fee' => { 'name' => 'Setup fee for this package',
'default' => 0,
Index: flat_comission.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/flat_comission.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- flat_comission.pm 4 Dec 2007 18:20:58 -0000 1.6
+++ flat_comission.pm 13 Apr 2008 07:41:28 -0000 1.7
@@ -9,6 +9,7 @@
%info = (
'name' => 'Flat rate with recurring commission per (any) active package',
+ 'shortname' => 'Commission per (any) active package',
'fields' => {
'setup_fee' => { 'name' => 'Setup fee for this package',
'default' => 0,
Index: sql_external.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/sql_external.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- sql_external.pm 19 Dec 2005 04:18:54 -0000 1.6
+++ sql_external.pm 13 Apr 2008 07:41:28 -0000 1.7
@@ -10,6 +10,7 @@
%info = (
'name' => 'Base charge plus additional fees for external services from a configurable SQL query',
+ 'shortname' => 'External SQL query',
'fields' => {
'setup_fee' => { 'name' => 'Setup fee for this package',
'default' => 0,
@@ -37,7 +38,7 @@
'fieldorder' => [qw( setup_fee recur_flat unused_credit datasrc db_username db_password query )],
#'setup' => 'what.setup_fee.value',
#'recur' => q!'my $dbh = DBI->connect("' + what.datasrc.value + '", "' + what.db_username.value + '", "' + what.db_password.value + '" ) or die $DBI::errstr; my $sth = $dbh->prepare("' + what.query.value + '") or die $dbh->errstr; my $price = ' + what.recur_flat.value + '; foreach my $cust_svc ( grep { $_->part_svc->svcdb eq "svc_external" } $cust_pkg->cust_svc ){ my $id = $cust_svc->svc_x->id; $sth->execute($id) or die $sth->errstr; $price += $sth->fetchrow_arrayref->[0]; } $price;'!,
- 'weight' => '72',
+ 'weight' => '58',
);
sub calc_recur {
Index: voip_cdr.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/voip_cdr.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- voip_cdr.pm 26 Mar 2008 03:04:33 -0000 1.9
+++ voip_cdr.pm 13 Apr 2008 07:41:28 -0000 1.10
@@ -27,6 +27,7 @@
%info = (
'name' => 'VoIP rating by plan of CDR records in an internal (or external) SQL table',
+ 'shortname' => 'VoIP/telco CDR rating (standard)',
'fields' => {
'setup_fee' => { 'name' => 'Setup fee for this package',
'default' => 0,
@@ -207,7 +208,7 @@
});
#
- die "Can't find rate for call $to_or_from +$countrycode $\numbern"
+ die "Can't find rate for call $to_or_from +$countrycode $number\n"
unless $rate_prefix;
$regionnum = $rate_prefix->regionnum;
Index: voip_sqlradacct.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/voip_sqlradacct.pm,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- voip_sqlradacct.pm 18 Feb 2006 11:14:20 -0000 1.18
+++ voip_sqlradacct.pm 13 Apr 2008 07:41:29 -0000 1.19
@@ -14,6 +14,7 @@
%info = (
'name' => 'VoIP rating by plan of CDR records in an SQL RADIUS radacct table',
+ 'shortname' => 'VoIP/telco CDR rating (external RADIUS)',
'fields' => {
'setup_fee' => { 'name' => 'Setup fee for this package',
'default' => 0,
Index: sesmon_minute.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/sesmon_minute.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- sesmon_minute.pm 19 Dec 2005 04:18:54 -0000 1.7
+++ sesmon_minute.pm 13 Apr 2008 07:41:28 -0000 1.8
@@ -9,6 +9,7 @@
%info = (
'name' => 'Base charge plus charge per-minute from the session monitor',
+ 'shortname' => 'Session monitor (per-minute)',
'fields' => {
'setup_fee' => { 'name' => 'Setup fee for this package',
'default' => 0,
Index: prorate.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/prorate.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- prorate.pm 23 Dec 2007 22:05:54 -0000 1.16
+++ prorate.pm 13 Apr 2008 07:41:28 -0000 1.17
@@ -10,6 +10,7 @@
%info = (
'name' => 'First partial month pro-rated, then flat-rate (selectable billing day)',
+ 'shortname' => 'Prorate (Nth of month billing)',
'fields' => {
'setup_fee' => { 'name' => 'Setup fee for this package',
'default' => 0,
Index: sqlradacct_hour.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/sqlradacct_hour.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- sqlradacct_hour.pm 9 Apr 2008 03:33:13 -0000 1.7
+++ sqlradacct_hour.pm 13 Apr 2008 07:41:28 -0000 1.8
@@ -9,6 +9,7 @@
%info = (
'name' => 'Base charge plus per-hour (and for data) from an SQL RADIUS radacct table',
+ 'shortname' => 'Usage charges from RADIUS',
'fields' => {
'setup_fee' => { 'name' => 'Setup fee for this package',
'default' => 0,
Index: flat_comission_pkg.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/flat_comission_pkg.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- flat_comission_pkg.pm 4 Dec 2007 18:20:58 -0000 1.5
+++ flat_comission_pkg.pm 13 Apr 2008 07:41:28 -0000 1.6
@@ -9,6 +9,7 @@
%info = (
'name' => 'Flat rate with recurring commission per (selected) active package',
+ 'shortname' => 'Commission per (selected) active package',
'fields' => {
'setup_fee' => { 'name' => 'Setup fee for this package',
'default' => 0,
Index: base_rate.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/base_rate.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- base_rate.pm 18 Sep 2007 06:32:50 -0000 1.2
+++ base_rate.pm 13 Apr 2008 07:41:28 -0000 1.3
@@ -9,6 +9,9 @@
%info = (
'name' => 'Base rate (anniversary billing, Times units ordered)',
+ # XXX it multiplies recurring fee by cust_pkg option "units", how to
+ # express that
+ 'shortname' => 'Bulk (manual from "units" option)',
'fields' => {
'setup_fee' => { 'name' => 'Setup fee for this package',
'default' => 0,
@@ -26,7 +29,7 @@
},
'fieldorder' => [ 'setup_fee', 'recur_fee', 'unused_credit',
'externalid' ],
- 'weight' => 10,
+ 'weight' => 52,
);
sub calc_setup {
Index: bulk.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/bulk.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- bulk.pm 13 Feb 2008 06:02:25 -0000 1.2
+++ bulk.pm 13 Apr 2008 07:41:28 -0000 1.3
@@ -32,7 +32,7 @@
},
'fieldorder' => [ 'setup_fee', 'recur_fee', 'svc_setup_fee', 'svc_recur_fee',
'unused_credit', ],
- 'weight' => 55,
+ 'weight' => 50,
);
sub calc_recur {
Index: base_delayed.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/base_delayed.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- base_delayed.pm 5 Mar 2007 23:01:53 -0000 1.2
+++ base_delayed.pm 13 Apr 2008 07:41:28 -0000 1.3
@@ -10,6 +10,7 @@
%info = (
'name' => 'Free (or setup fee) for X days, then base rate'.
' (anniversary billing)',
+ 'shortname' => 'Bulk (manual from "units" option), w/intro period',
'fields' => {
'setup_fee' => { 'name' => 'Setup fee for this package',
'default' => 0,
@@ -35,7 +36,7 @@
],
#'setup' => '\'my $d = $cust_pkg->bill || $time; $d += 86400 * \' + what.free_days.value + \'; $cust_pkg->bill($d); $cust_pkg_mod_flag=1; \' + what.setup_fee.value',
#'recur' => 'what.recur_fee.value',
- 'weight' => 50,
+ 'weight' => 54, #&g!
);
sub calc_setup {
Index: sql_generic.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/sql_generic.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- sql_generic.pm 19 Dec 2005 04:18:54 -0000 1.6
+++ sql_generic.pm 13 Apr 2008 07:41:28 -0000 1.7
@@ -10,6 +10,7 @@
%info = (
'name' => 'Base charge plus a per-domain metered rate from a configurable SQL query',
+ 'shortname' => 'Bulk (per-domain from SQL query)',
'fields' => {
'setup_fee' => { 'name' => 'Setup fee for this package',
'default' => 0,
@@ -45,7 +46,7 @@
# 'recur' => '\'my $dbh = DBI->connect(\"\' + what.datasrc.value + \'\", \"\' + what.db_username.value + \'\") or die $DBI::errstr; \'',
#'recur' => '\'my $dbh = DBI->connect(\"\' + what.datasrc.value + \'\", \"\' + what.db_username.value + \'\", \"\' + what.db_password.value + \'\" ) or die $DBI::errstr; my $sth = $dbh->prepare(\"\' + what.query.value + \'\") or die $dbh->errstr; my $units = 0; foreach my $cust_svc ( grep { $_->part_svc->svcdb eq \"svc_domain\" } $cust_pkg->cust_svc ) { my $domain = $cust_svc->svc_x->domain; $sth->execute($domain) or die $sth->errstr; $units += $sth->fetchrow_arrayref->[0]; } $units -= \' + what.recur_included.value + \'; $units = 0 if $units < 0; \' + what.recur_flat.value + \' + $units * \' + what.recur_unit_charge.value + \';\'',
#'recur' => '\'my $dbh = DBI->connect("\' + what.datasrc.value + \'", "\' + what.db_username.value + \'", "\' what.db_password.value + \'" ) or die $DBI::errstr; my $sth = $dbh->prepare("\' + what.query.value + \'") or die $dbh->errstr; my $units = 0; foreach my $cust_svc ( grep { $_->part_svc->svcdb eq "svc_domain" } $cust_pkg->cust_svc ) { my $domain = $cust_svc->svc_x->domain; $sth->execute($domain) or die $sth->errstr; $units += $sth->fetchrow_arrayref->[0]; } $units -= \' + what.recur_included.value + \'; $units = 0 if $units < 0; \' + what.recur_flat.value + \' + $units * \' + what.recur_unit_charge + \';\'',
- 'weight' => '70',
+ 'weight' => '56',
);
sub calc_recur {
Index: subscription.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/subscription.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- subscription.pm 23 Dec 2007 22:05:54 -0000 1.14
+++ subscription.pm 13 Apr 2008 07:41:28 -0000 1.15
@@ -10,6 +10,7 @@
%info = (
'name' => 'First partial month full charge, then flat-rate (selectable billing day)',
+ 'shortname' => 'Subscription (Nth of month, full charge for first)',
'fields' => {
'setup_fee' => { 'name' => 'Setup fee for this package',
'default' => 0,
Index: flat_delayed.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/flat_delayed.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- flat_delayed.pm 1 Aug 2007 22:24:50 -0000 1.6
+++ flat_delayed.pm 13 Apr 2008 07:41:28 -0000 1.7
@@ -10,6 +10,7 @@
%info = (
'name' => 'Free (or setup fee) for X days, then flat rate'.
' (anniversary billing)',
+ 'shortname' => 'Anniversary, with intro period',
'fields' => {
'setup_fee' => { 'name' => 'Setup fee for this package',
'default' => 0,
@@ -35,7 +36,7 @@
],
#'setup' => '\'my $d = $cust_pkg->bill || $time; $d += 86400 * \' + what.free_days.value + \'; $cust_pkg->bill($d); $cust_pkg_mod_flag=1; \' + what.setup_fee.value',
#'recur' => 'what.recur_fee.value',
- 'weight' => 50,
+ 'weight' => 12,
);
sub calc_setup {
Index: prorate_delayed.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/prorate_delayed.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- prorate_delayed.pm 1 Aug 2007 22:24:50 -0000 1.1
+++ prorate_delayed.pm 13 Apr 2008 07:41:28 -0000 1.2
@@ -10,6 +10,7 @@
%info = (
'name' => 'Free (or setup fee) for X days, then prorate, then flat-rate ' .
'(1st of month billing)',
+ 'shortname' => 'Prorate (Nth of month billing), with intro period', #??
'fields' => {
'setup_fee' => { 'name' => 'Setup fee for this package',
'default' => 0,
@@ -28,7 +29,7 @@
'fieldorder' => [ 'free_days', 'setup_fee', 'recur_fee', 'unused_credit' ],
#'setup' => '\'my $d = $cust_pkg->bill || $time; $d += 86400 * \' + what.free_days.value + \'; $cust_pkg->bill($d); $cust_pkg_mod_flag=1; \' + what.setup_fee.value',
#'recur' => 'what.recur_fee.value',
- 'weight' => 50,
+ 'weight' => 22,
);
sub calc_setup {
More information about the freeside-commits
mailing list