modular price plans!

12 files changed, 680 insertions, 0 deletions

diff --git a/FS/FS/part_pkg/flat.pm b/FS/FS/part_pkg/flat.pm
new file mode 100644
index 000000000..a3939ba9e
--- /dev/null
+++ b/FS/FS/part_pkg/flat.pm
@@ -0,0 +1,36 @@
+package FS::part_pkg::flat;
+
+use strict;
+use vars qw(@ISA %info);
+#use FS::Record qw(qsearch);
+use FS::part_pkg;
+
+@ISA = qw(FS::part_pkg);
+
+%info = (
+  'name' => 'Flat rate (anniversary billing)',
+  'fields' => {
+    'setup_fee' => { 'name' => 'Setup fee for this package',
+                     'default' => 0,
+                   },
+    'recur_fee' => { 'name' => 'Recurring fee for this package',
+                     'default' => 0,
+                    },
+  },
+  'fieldorder' => [ 'setup_fee', 'recur_fee' ],
+  #'setup' => 'what.setup_fee.value',
+  #'recur' => 'what.recur_fee.value',
+  'weight' => 10,
+);
+
+sub calc_setup {
+  my($self, $cust_pkg ) = @_;
+  $self->option('setup_fee');
+}
+
+sub calc_recur {
+  my($self, $cust_pkg ) = @_;
+  $self->option('recur_fee');
+}
+
+1;
diff --git a/FS/FS/part_pkg/flat_comission.pm b/FS/FS/part_pkg/flat_comission.pm
new file mode 100644
index 000000000..d39347015
--- /dev/null
+++ b/FS/FS/part_pkg/flat_comission.pm
@@ -0,0 +1,51 @@
+package FS::part_pkg::flat_comission;
+
+use strict;
+use vars qw(@ISA %info);
+#use FS::Record qw(qsearch qsearchs);
+use FS::part_pkg;
+
+@ISA = qw(FS::part_pkg);
+
+%info = (
+    'name' => 'Flat rate with recurring commission per (any) active package',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_fee' => { 'name' => 'Recurring fee for this package',
+                       'default' => 0,
+                     },
+      'comission_amount' => { 'name' => 'Commission amount per month (per active package)',
+                              'default' => 0,
+                            },
+      'comission_depth'  => { 'name' => 'Number of layers',
+                              'default' => 1,
+                            },
+    },
+    'fieldorder' => [ 'setup_fee', 'recur_fee', 'comission_depth', 'comission_amount' ],
+    #'setup' => 'what.setup_fee.value',
+    #'recur' => '\'my $error = $cust_pkg->cust_main->credit( \' + what.comission_amount.value + \' * scalar($cust_pkg->cust_main->referral_cust_pkg(\' + what.comission_depth.value+ \')), "commission" ); die $error if $error; \' + what.recur_fee.value + \';\'',
+    'weight' => 62,
+);
+
+sub calc_setup {
+  my($self, $cust_pkg ) = @_;
+  $self->option('setup_fee');
+}
+
+sub calc_recur {
+  my($self, $cust_pkg ) = @_;
+
+  my $amount = $self->option('comission_amount');
+  my $num_active = scalar(
+    $cust_pkg->cust_main->referral_cust_pkg( $self->option('comission_depth') )
+  );
+
+  my $error = $cust_pkg->cust_main->credit( $amount*$num_active, "commission" );
+  die $error if $error;
+
+  $self->option('recur_fee');
+}
+
+1;
diff --git a/FS/FS/part_pkg/flat_comission_cust.pm b/FS/FS/part_pkg/flat_comission_cust.pm
new file mode 100644
index 000000000..5de45c5ef
--- /dev/null
+++ b/FS/FS/part_pkg/flat_comission_cust.pm
@@ -0,0 +1,53 @@
+package FS::part_pkg::flat_comission_cust;
+
+use strict;
+use vars qw(@ISA %info);
+#use FS::Record qw(qsearch qsearchs);
+use FS::part_pkg;
+
+@ISA = qw(FS::part_pkg);
+
+%info = (
+    'name' => 'Flat rate with recurring commission per active customer',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_fee' => { 'name' => 'Recurring fee for this package',
+                       'default' => 0,
+                     },
+      'comission_amount' => { 'name' => 'Commission amount per month (per active customer)',
+                              'default' => 0,
+                            },
+      'comission_depth'  => { 'name' => 'Number of layers',
+                              'default' => 1,
+                            },
+    },
+    'fieldorder' => [ 'setup_fee', 'recur_fee', 'comission_depth', 'comission_amount' ],
+    #'setup' => 'what.setup_fee.value',
+    #'recur' => '\'my $error = $cust_pkg->cust_main->credit( \' + what.comission_amount.value + \' * scalar($cust_pkg->cust_main->referral_cust_main_ncancelled(\' + what.comission_depth.value+ \')), "commission" ); die $error if $error; \' + what.recur_fee.value + \';\'',
+    'weight' => '60',
+);
+
+sub calc_setup {
+  my($self, $cust_pkg ) = @_;
+  $self->option('setup_fee');
+}
+
+sub calc_recur {
+  my($self, $cust_pkg ) = @_;
+
+  my $amount = $self->option('comission_amount');
+  my $num_active = scalar(
+    $cust_pkg->cust_main->referral_cust_pkgcust_main_ncancelled(
+      $self->option('comission_depth')
+    )
+  );
+
+  my $error = $cust_pkg->cust_main->credit( $amount*$num_active, "commission" );
+  die $error if $error;
+
+  $self->option('recur_fee');
+}
+
+1;
diff --git a/FS/FS/part_pkg/flat_comission_pkg.pm b/FS/FS/part_pkg/flat_comission_pkg.pm
new file mode 100644
index 000000000..1e6e69bb7
--- /dev/null
+++ b/FS/FS/part_pkg/flat_comission_pkg.pm
@@ -0,0 +1,50 @@
+package FS::part_pkg::flat_comission_pkg;
+
+use strict;
+use vars qw(@ISA %info);
+#use FS::Record qw(qsearch qsearchs);
+use FS::part_pkg;
+
+@ISA = qw(FS::part_pkg);
+
+%info = (
+    'name' => 'Flat rate with recurring commission per (selected) active package',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_fee' => { 'name' => 'Recurring fee for this package',
+                       'default' => 0,
+                     },
+      'comission_amount' => { 'name' => 'Commission amount per month (per uncancelled package)',
+                              'default' => 0,
+                            },
+      'comission_depth'  => { 'name' => 'Number of layers',
+                              'default' => 1,
+                            },
+      'comission_pkgpart' => { 'name' => 'Applicable packages<BR><FONT SIZE="-1">(hold <b>ctrl</b> to select multiple packages)</FONT>',
+                               'type' => 'select_multiple',
+                               'select_table' => 'part_pkg',
+                               'select_hash'  => { 'disabled' => '' } ,
+                               'select_key'   => 'pkgpart',
+                               'select_label' => 'pkg',
+                             },
+    },
+    'fieldorder' => [ 'setup_fee', 'recur_fee', 'comission_depth', 'comission_amount', 'comission_pkgpart' ],
+    #'setup' => 'what.setup_fee.value',
+    #'recur' => '""; var pkgparts = ""; for ( var c=0; c < document.flat_comission_pkg.comission_pkgpart.options.length; c++ ) { if (document.flat_comission_pkg.comission_pkgpart.options[c].selected) { pkgparts = pkgparts + document.flat_comission_pkg.comission_pkgpart.options[c].value + \', \'; } } what.recur.value = \'my $error = $cust_pkg->cust_main->credit( \' + what.comission_amount.value + \' * scalar( grep { my $pkgpart = $_->pkgpart; grep { $_ == $pkgpart } ( \' + pkgparts + \'  ) } $cust_pkg->cust_main->referral_cust_pkg(\' + what.comission_depth.value+ \')), "commission" ); die $error if $error; \' + what.recur_fee.value + \';\'',
+    #'disabled' => 1,
+    'weight' => '64',
+);
+
+sub calc_setup {
+  my($self, $cust_pkg ) = @_;
+  $self->option('setup_fee');
+}
+
+sub calc_recur {
+  my($self, $cust_pkg ) = @_;
+  $self->option('recur_fee');
+}
+
+1;
diff --git a/FS/FS/part_pkg/flat_delayed.pm b/FS/FS/part_pkg/flat_delayed.pm
new file mode 100644
index 000000000..cf4ffef84
--- /dev/null
+++ b/FS/FS/part_pkg/flat_delayed.pm
@@ -0,0 +1,45 @@
+package FS::part_pkg::flat_delayed;
+
+use strict;
+use vars qw(@ISA %info);
+#use FS::Record qw(qsearch qsearchs);
+use FS::part_pkg;
+
+@ISA = qw(FS::part_pkg);
+
+%info = (
+    'name' => 'Free (or setup fee) for X days, then flat rate'.
+              ' (anniversary billing)',
+    'fields' =>  {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'free_days' => { 'name' => 'Initial free days',
+                       'default' => 0,
+                     },
+      'recur_fee' => { 'name' => 'Recurring fee for this package',
+                       'default' => 0,
+                      },
+    },
+    'fieldorder' => [ 'free_days', 'setup_fee', 'recur_fee' ],
+    #'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,
+);
+
+sub calc_setup {
+  my($self, $cust_pkg, $time ) = @_;
+
+  my $d = $cust_pkg->bill || $time;
+  $d += 86400 * $self->option('free_days');
+  $cust_pkg->bill($d);
+  
+  $self->option('setup_fee');
+}
+
+sub calc_recur {
+  my($self, $cust_pkg ) = @_;
+  $self->option('recur_fee');
+}
+
+1;
diff --git a/FS/FS/part_pkg/prorate.pm b/FS/FS/part_pkg/prorate.pm
new file mode 100644
index 000000000..37cb37faf
--- /dev/null
+++ b/FS/FS/part_pkg/prorate.pm
@@ -0,0 +1,46 @@
+package FS::part_pkg::prorate;
+
+use strict;
+use vars qw(@ISA %info);
+use Time::Local qw(timelocal);
+#use FS::Record qw(qsearch qsearchs);
+use FS::part_pkg;
+
+@ISA = qw(FS::part_pkg);
+
+%info = (
+    'name' => 'First partial month pro-rated, then flat-rate (1st of month billing)',
+    'fields' =>  {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_fee' => { 'name' => 'Recurring fee for this package',
+                       'default' => 0,
+                      },
+    },
+    'fieldorder' => [ 'setup_fee', 'recur_fee' ],
+    #'setup' => 'what.setup_fee.value',
+    #'recur' => '\'my $mnow = $sdate; my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($sdate) )[0,1,2,3,4,5]; my $mstart = timelocal(0,0,0,1,$mon,$year); my $mend = timelocal(0,0,0,1, $mon == 11 ? 0 : $mon+1, $year+($mon==11)); $sdate = $mstart; ( $part_pkg->freq - 1 ) * \' + what.recur_fee.value + \' / $part_pkg->freq + \' + what.recur_fee.value + \' / $part_pkg->freq * ($mend-$mnow) / ($mend-$mstart) ; \'',
+    'freq' => 'm',
+    'weight' => 20,
+);
+
+sub calc_setup {
+  my($self, $cust_pkg ) = @_;
+  $self->option('setup_fee');
+}
+
+sub calc_recur {
+  my($self, $cust_pkg, $sdate ) = @_;
+  my $mnow = $$sdate;
+  my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($mnow) )[0,1,2,3,4,5];
+  my $mstart = timelocal(0,0,0,1,$mon,$year);
+  my $mend = timelocal(0,0,0,1, $mon == 11 ? 0 : $mon+1, $year+($mon==11));
+  $$sdate = $mstart;
+
+  my $permonth = $self->option('recur_fee') / $self->freq;
+
+  $permonth * ( ( $self->freq - 1 ) + ($mend-$mnow) / ($mend-$mstart) );
+}
+
+1;
diff --git a/FS/FS/part_pkg/sesmon_hour.pm b/FS/FS/part_pkg/sesmon_hour.pm
new file mode 100644
index 000000000..8f6da197e
--- /dev/null
+++ b/FS/FS/part_pkg/sesmon_hour.pm
@@ -0,0 +1,48 @@
+package FS::part_pkg::sesmon_hour;
+
+use strict;
+use vars qw(@ISA %info);
+#use FS::Record qw(qsearch qsearchs);
+use FS::part_pkg;
+
+@ISA = qw(FS::part_pkg);
+
+%info = (
+    'name' => 'Base charge plus charge per-hour from the session monitor',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_flat' => { 'name' => 'Base monthly charge for this package',
+                        'default' => 0,
+                      },
+      'recur_included_hours' => { 'name' => 'Hours included',
+                                  'default' => 0,
+                                },
+      'recur_hourly_charge' => { 'name' => 'Additional charge per hour',
+                                 'default' => 0,
+                               },
+    },
+    'fieldorder' => [ 'setup_fee', 'recur_flat', 'recur_included_hours', 'recur_hourly_charge' ],
+    #'setup' => 'what.setup_fee.value',
+    #'recur' => '\'my $hours = $cust_pkg->seconds_since($cust_pkg->bill || 0) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours;\'',
+    'weight' => 80,
+);
+
+sub calc_setup {
+  my($self, $cust_pkg ) = @_;
+  $self->option('setup_fee');
+}
+
+sub calc_recur {
+  my($self, $cust_pkg ) = @_;
+
+  my $hours = $cust_pkg->seconds_since($cust_pkg->bill || 0) / 3600;
+  $hours -= $self->option('recur_included_hours');
+  $hours = 0 if $hours < 0;
+
+  $self->option('recur_flat') + $hours * $self->option('recur_hourly_charge');
+
+}
+
+1;
diff --git a/FS/FS/part_pkg/sesmon_minute.pm b/FS/FS/part_pkg/sesmon_minute.pm
new file mode 100644
index 000000000..9ef76d781
--- /dev/null
+++ b/FS/FS/part_pkg/sesmon_minute.pm
@@ -0,0 +1,46 @@
+package FS::part_pkg::sesmon_minute;
+
+use strict;
+use vars qw(@ISA %info);
+#use FS::Record qw(qsearch qsearchs);
+use FS::part_pkg;
+
+@ISA = qw(FS::part_pkg);
+
+%info = (
+    'name' => 'Base charge plus charge per-minute from the session monitor',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_flat' => { 'name' => 'Base monthly charge for this package',
+                        'default' => 0,
+                      },
+      'recur_included_min' => { 'name' => 'Minutes included',
+                                'default' => 0,
+                                },
+      'recur_minly_charge' => { 'name' => 'Additional charge per minute',
+                                'default' => 0,
+                              },
+    },
+    'fieldorder' => [ 'setup_fee', 'recur_flat', 'recur_included_min', 'recur_minly_charge' ],
+    #'setup' => 'what.setup_fee.value',
+    #'recur' => '\'my $min = $cust_pkg->seconds_since($cust_pkg->bill || 0) / 60 - \' + what.recur_included_min.value + \'; $min = 0 if $min < 0; \' + what.recur_flat.value + \' + \' + what.recur_minly_charge.value + \' * $min;\'',
+    'weight' => 80,
+);
+
+sub calc_setup {
+  my( $self, $cust_pkg ) = @_;
+  $self->option('setup_fee');
+}
+
+sub cakc_recur {
+  my( $self, $cust_pkg ) = @);
+  my $min = $cust_pkg->seconds_since($cust_pkg->bill || 0) / 60;
+  $min -= $self->option('recur_included_min');
+  $min = 0 if $min < 0;
+
+  $self->option('recur_flat') + $min * $self->option('recur_minly_charge');
+}
+
+1;
diff --git a/FS/FS/part_pkg/sql_external.pm b/FS/FS/part_pkg/sql_external.pm
new file mode 100644
index 000000000..688f91887
--- /dev/null
+++ b/FS/FS/part_pkg/sql_external.pm
@@ -0,0 +1,68 @@
+package FS::part_pkg::sql_external;
+
+use strict;
+use vars qw(@ISA %info);
+use DBI;
+#use FS::Record qw(qsearch qsearchs);
+use FS::part_pkg;
+
+@ISA = qw(FS::part_pkg);
+
+%info = (
+    'name' => 'Base charge plus additional fees for external services from a configurable SQL query',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_flat' => { 'name' => 'Base monthly charge for this package',
+                        'default' => 0,
+                      },
+      'datasrc' => { 'name' => 'DBI data source',
+                     'default' => '',
+                   },
+      'db_username' => { 'name' => 'Database username',
+                         'default' => '',
+                       },
+      'db_password' => { 'name' => 'Database password',
+                         'default' => '',
+                       },
+      'query' => { 'name' => 'SQL query',
+                   'default' => '',
+                 },
+    },
+    'fieldorder' => [qw( setup_fee recur_flat 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',
+);
+
+sub calc_setup {
+  my($self, $cust_pkg ) = @_;
+  $self->option('setup_fee');
+}
+
+sub calc_recur {
+  my($self, $cust_pkg ) = @_;
+
+  my $dbh = DBI->connect( map { $self->option($_) }
+                              qw( datasrc db_username db_password )
+                        )
+    or die $DBI::errstr;
+
+  my $sth = $dbh->prepare( $self->option('query') )
+    or die $dbh->errstr;
+
+  my $price = $self->option('recur_flat');
+
+  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;
+}
+
+1;
diff --git a/FS/FS/part_pkg/sql_generic.pm b/FS/FS/part_pkg/sql_generic.pm
new file mode 100644
index 000000000..85c341375
--- /dev/null
+++ b/FS/FS/part_pkg/sql_generic.pm
@@ -0,0 +1,79 @@
+package FS::part_pkg::sql_generic;
+
+use strict;
+use vars qw(@ISA %info);
+use DBI;
+#use FS::Record qw(qsearch qsearchs);
+use FS::part_pkg;
+
+@ISA = qw(FS::part_pkg);
+
+%info = (
+    'name' => 'Base charge plus a per-domain metered rate from a configurable SQL query',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_flat' => { 'name' => 'Base monthly charge for this package',
+                        'default' => 0,
+                      },
+      'recur_included' => { 'name' => 'Units included',
+                            'default' => 0,
+                          },
+      'recur_unit_charge' => { 'name' => 'Additional charge per unit',
+                               'default' => 0,
+                             },
+      'datasrc' => { 'name' => 'DBI data source',
+                     'default' => '',
+                   },
+      'db_username' => { 'name' => 'Database username',
+                         'default' => '',
+                       },
+      'db_password' => { 'name' => 'Database username',
+                         'default' => '',
+                       },
+      'query' => { 'name' => 'SQL query',
+                   'default' => '',
+                 },
+    },
+    'fieldorder' => [qw( setup_fee recur_flat recur_included recur_unit_charge datasrc db_username db_password query )],
+   # 'setup' => 'what.setup_fee.value',
+   # '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',
+);
+
+sub calc_setup {
+  my($self, $cust_pkg ) = @_;
+  $self->option('setup_fee');
+}
+
+sub calc_recur {
+  my($self, $cust_pkg ) = @_;
+
+  my $dbh = DBI->connect( map { $self->option($_) }
+                              qw( datasrc db_username db_password )
+                        )
+    or die $DBI::errstr;
+
+  my $sth = $dbh->prepare( $self->option('query') )
+    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 -= $self->option('recur_included');
+  $units = 0 if $units < 0;
+
+  $self->option('recur_flat') + $units * $self->option('recur_unit_charge');
+}
+
+1;
diff --git a/FS/FS/part_pkg/sqlradacct_hour.pm b/FS/FS/part_pkg/sqlradacct_hour.pm
new file mode 100644
index 000000000..f5ad2b1fc
--- /dev/null
+++ b/FS/FS/part_pkg/sqlradacct_hour.pm
@@ -0,0 +1,115 @@
+package FS::part_pkg::sqlradacct_hour;
+
+use strict;
+use vars qw(@ISA %info);
+#use FS::Record qw(qsearch qsearchs);
+use FS::part_pkg;
+
+@ISA = qw(FS::part_pkg);
+
+%info = (
+    'name' => 'Base charge plus per-hour (and for data) from an SQL RADIUS radacct table',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_flat' => { 'name' => 'Base monthly charge for this package',
+                        'default' => 0,
+                      },
+      'recur_included_hours' => { 'name' => 'Hours included',
+                                  'default' => 0,
+                                },
+      'recur_hourly_charge' => { 'name' => 'Additional charge per hour',
+                                 'default' => 0,
+                               },
+      'recur_included_input' => { 'name' => 'Upload megabytes included',
+                                  'default' => 0,
+                                },
+      'recur_input_charge' => { 'name' =>
+                                        'Additional charge per megabyte upload',
+                                'default' => 0,
+                              },
+      'recur_included_output' => { 'name' => 'Download megabytes included',
+                                   'default' => 0,
+                                },
+      'recur_output_charge' => { 'name' =>
+                                       'Additional charge per megabyte download',
+                                'default' => 0,
+                              },
+      'recur_included_total' => { 'name' =>
+                                       'Total megabytes included',
+                                  'default' => 0,
+                                },
+      'recur_total_charge' => { 'name' =>
+                                 'Additional charge per megabyte total',
+                                'default' => 0,
+                              },
+    },
+    'fieldorder' => [qw( setup_fee recur_flat recur_included_hours recur_hourly_charge recur_included_input recur_input_charge recur_included_output recur_output_charge recur_included_total recur_total_charge )],
+    #'setup' => 'what.setup_fee.value',
+    #'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctInputOctets\" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctOutputOctets\" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; my $totalcharge = sprintf(\"%.2f\", \' + what.recur_total_charge.value + \' * $total); my $inputcharge = sprintf(\"%.2f\", \' + what.recur_input_charge.value + \' * $input); my $outputcharge = sprintf(\"%.2f\", \' + what.recur_output_charge.value + \' * $output); my $hourscharge = sprintf(\"%.2f\", \' + what.recur_hourly_charge.value + \' * $hours); if ( \' + what.recur_total_charge.value + \' > 0 ) { push @details, \"Last month\\\'s data \". sprintf(\"%.1f\", $total). \" megs: \\\$$totalcharge\" } if ( \' + what.recur_input_charge.value + \' > 0 ) { push @details, \"Last month\\\'s download \". sprintf(\"%.1f\", $input). \" megs: \\\$$inputcharge\" } if ( \' + what.recur_output_charge.value + \' > 0 ) { push @details, \"Last month\\\'s upload \". sprintf(\"%.1f\", $output). \" megs: \\\$$outputcharge\" } if ( \' + what.recur_hourly_charge.value + \' > 0 ) { push @details, \"Last month\\\'s time \". sprintf(\"%.1f\", $hours). \" hours: \\\$$hourscharge\"; } \' + what.recur_flat.value + \' + $hourscharge + $inputcharge + $outputcharge + $totalcharge ;\'',
+    'weight' => 40,
+);
+
+sub calc_setup {
+  my($self, $cust_pkg ) = @_;
+  $self->option('setup_fee');
+}
+
+sub calc_recur {
+  my($self, $cust_pkg, $sdate, $details ) = @_;
+
+  my $last_bill = $cust_pkg->last_bill;
+  my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $$sdate ) / 3600;
+  $hours -= $self->option('recur_included_hours');
+  $hours = 0 if $hours < 0;
+
+  my $input = $cust_pkg->attribute_since_sqlradacct(  $last_bill,
+                                                      $$sdate,
+                                                      'AcctInputOctets' )
+              / 1048576;
+
+  my $output = $cust_pkg->attribute_since_sqlradacct( $last_bill,
+                                                      $$sdate,
+                                                      'AcctOutputOctets' )
+               / 1048576;
+
+  my $total = $input + $output - $self->option('recur_included_total');
+  $total = 0 if $total < 0;
+  $input = $input - $self->option('recur_included_input');
+  $input = 0 if $input < 0;
+  $output = $output - $self->option('recur_included_output');
+  $output = 0 if $output < 0;
+
+  my $totalcharge =
+    $total  * sprintf('%.2f', $self->option('recur_total_charge'));
+  my $inputcharge =
+    $input  * sprintf('%.2f', $self->option('recur_input_charge'));
+  my $outputcharge = 
+    $output * sprintf('%.2f', $self->option('recur_output_charge'));
+
+  my $hourscharge =
+    $hours * sprintf('%.2f', $self->option('recur_hourly_charge'));
+
+  if ( $self->option('recur_total_charge') > 0 ) {
+    push @$details, "Last month's data ".
+                    sprintf('%.1f', $total). " megs: $totalcharge";
+  }
+  if ( $self->option('recur_input_charge') > 0 ) {
+    push @$details, "Last month's download ".
+                   sprintf('%.1f', $input). " megs: $inputcharge";
+  }
+  if ( $self->option('recur_output_charge') > 0 ) {
+    push @$details, "Last month's upload ".
+                   sprintf('%.1f', $output). " megs: $outputcharge";
+  }
+  if ( $self->option('recur_hourly_charge')  > 0 ) {
+    push @$details, "Last month\'s time ".
+                   sprintf('%.1f', $hours). " hours: $hourscharge";
+  }
+
+  $self->option('recur_flat')
+    + $hourscharge + $inputcharge + $outputcharge + $totalcharge;
+}
+
+1;
diff --git a/FS/FS/part_pkg/subscription.pm b/FS/FS/part_pkg/subscription.pm
new file mode 100644
index 000000000..4dc9252a7
--- /dev/null
+++ b/FS/FS/part_pkg/subscription.pm
@@ -0,0 +1,43 @@
+package FS::part_pkg::subscription;
+
+use strict;
+use vars qw(@ISA %info);
+use Time::Local qw(timelocal);
+#use FS::Record qw(qsearch qsearchs);
+use FS::part_pkg;
+
+@ISA = qw(FS::part_pkg);
+
+%info = (
+    'name' => 'First partial month full charge, then flat-rate (1st of month billing)',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_fee' => { 'name' => 'Recurring fee for this package',
+                       'default' => 0,
+                      },
+    },
+    'fieldorder' => [ 'setup_fee', 'recur_fee' ],
+    #'setup' => 'what.setup_fee.value',
+    #'recur' => '\'my $mnow = $sdate; my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($sdate) )[0,1,2,3,4,5]; $sdate = timelocal(0,0,0,1,$mon,$year); \' + what.recur_fee.value',
+    'freq' => 'm',
+    'weight' => 30,
+);
+
+sub calc_setup {
+  my($self, $cust_pkg ) = @_;
+  $self->option('setup_fee');
+}
+
+sub calc_recur {
+  my($self, $cust_pkg, $sdate ) = @_;
+
+  my $mnow = $$sdate;
+  my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($mnow) )[0,1,2,3,4,5];
+  $$sdate = timelocal(0,0,0,1,$mon,$year);
+
+  $self->option('recur_fee');
+}
+
+1;