From 8a7eec7b683294a15aab0b2bf1710e10fa80b4c5 Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Thu, 9 Jan 2014 14:13:33 -0800 Subject: [PATCH] removing obsolete price plans --- FS/FS/part_pkg/flat_comission.pm | 68 ----------------------------------- FS/FS/part_pkg/flat_comission_cust.pm | 44 ----------------------- FS/FS/part_pkg/flat_comission_pkg.pm | 38 -------------------- FS/FS/part_pkg/sesmon_hour.pm | 58 ------------------------------ FS/FS/part_pkg/sesmon_minute.pm | 56 ----------------------------- 5 files changed, 264 deletions(-) delete mode 100644 FS/FS/part_pkg/flat_comission.pm delete mode 100644 FS/FS/part_pkg/flat_comission_cust.pm delete mode 100644 FS/FS/part_pkg/flat_comission_pkg.pm delete mode 100644 FS/FS/part_pkg/sesmon_hour.pm delete mode 100644 FS/FS/part_pkg/sesmon_minute.pm diff --git a/FS/FS/part_pkg/flat_comission.pm b/FS/FS/part_pkg/flat_comission.pm deleted file mode 100644 index 0bc1e7cb4..000000000 --- a/FS/FS/part_pkg/flat_comission.pm +++ /dev/null @@ -1,68 +0,0 @@ -package FS::part_pkg::flat_comission; - -use strict; -use vars qw(@ISA %info); -#use FS::Record qw(qsearch qsearchs); -use FS::part_pkg::flat; - -@ISA = qw(FS::part_pkg::flat); - -%info = ( - 'name' => 'Flat rate with recurring commission per (any) active package', - 'shortname' => 'Commission per (any) active package', - 'inherit_fields' => [ 'global_Mixin' ], - 'fields' => { - 'comission_amount' => { 'name' => 'Commission amount per month (per active package)', - 'default' => 0, - }, - 'comission_depth' => { 'name' => 'Number of layers', - 'default' => 1, - }, - 'reason_type' => { 'name' => 'Reason type for commission credits', - 'type' => 'select', - 'select_table' => 'reason_type', - 'select_hash' => { 'class' => 'R' }, - 'select_key' => 'typenum', - 'select_label' => 'type', - }, - }, - 'fieldorder' => [ 'comission_depth', 'comission_amount', 'reason_type' ], - #'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 price_info { - my $self = shift; - my $str = $self->SUPER::price_info; - my $com = $self->option('comission_amount'); - $str .= ", $com commission" if $com; - $str; -} - -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 $commission = sprintf('%.2f', $amount*$num_active); - - if ( $commission > 0 ) { - - my $error = - $cust_pkg->cust_main->credit( $commission, "commission", - 'reason_type'=>$self->option('reason_type'), - ); - die $error if $error; - - } - - $self->option('recur_fee'); -} - -sub can_discount { 0; } - -1; diff --git a/FS/FS/part_pkg/flat_comission_cust.pm b/FS/FS/part_pkg/flat_comission_cust.pm deleted file mode 100644 index 5acf73d7a..000000000 --- a/FS/FS/part_pkg/flat_comission_cust.pm +++ /dev/null @@ -1,44 +0,0 @@ -package FS::part_pkg::flat_comission_cust; - -use strict; -use vars qw(@ISA %info); -#use FS::Record qw(qsearch qsearchs); -use FS::part_pkg::flat; - -@ISA = qw(FS::part_pkg::flat); - -%info = ( - 'name' => 'Flat rate with recurring commission per active customer', - 'shortname' => 'Commission per active customer', - 'inherit_fields' => [ 'flat_comission', 'global_Mixin' ], - 'fields' => { }, - 'fieldorder' => [ ], - #'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_recur { - my($self, $cust_pkg ) = @_; - - my $amount = $self->option('comission_amount'); - my $num_active = scalar( - $cust_pkg->cust_main->referral_cust_main_ncancelled( - $self->option('comission_depth') - ) - ); - - if ( $amount && $num_active ) { - my $error = - $cust_pkg->cust_main->credit( $amount*$num_active, "commission", - 'reason_type'=>$self->option('reason_type'), - ); - die $error if $error; - } - - $self->option('recur_fee'); -} - -sub can_discount { 0; } - -1; diff --git a/FS/FS/part_pkg/flat_comission_pkg.pm b/FS/FS/part_pkg/flat_comission_pkg.pm deleted file mode 100644 index 26dd4d2fc..000000000 --- a/FS/FS/part_pkg/flat_comission_pkg.pm +++ /dev/null @@ -1,38 +0,0 @@ -package FS::part_pkg::flat_comission_pkg; - -use strict; -use vars qw(@ISA %info); -#use FS::Record qw(qsearch qsearchs); -use FS::part_pkg::flat; - -@ISA = qw(FS::part_pkg::flat); - -%info = ( - 'name' => 'Flat rate with recurring commission per (selected) active package', - 'shortname' => 'Commission per (selected) active package', - 'inherit_fields' => [ 'flat_comission', 'global_Mixin' ], - 'fields' => { - 'comission_pkgpart' => { 'name' => 'Applicable packages
(hold ctrl to select multiple packages)', - 'type' => 'select_multiple', - 'select_table' => 'part_pkg', - 'select_hash' => { 'disabled' => '' } , - 'select_key' => 'pkgpart', - 'select_label' => 'pkg', - }, - }, - 'fieldorder' => [ 'comission_depth', 'comission_amount', 'comission_pkgpart', 'reason_type' ], - #'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', -); - -# XXX this needs to be fixed!!! -sub calc_recur { - my($self, $cust_pkg ) = @_; - $self->option('recur_fee'); -} - -sub can_discount { 0; } - -1; diff --git a/FS/FS/part_pkg/sesmon_hour.pm b/FS/FS/part_pkg/sesmon_hour.pm deleted file mode 100644 index 8d019c306..000000000 --- a/FS/FS/part_pkg/sesmon_hour.pm +++ /dev/null @@ -1,58 +0,0 @@ -package FS::part_pkg::sesmon_hour; - -use strict; -use vars qw(@ISA %info); -#use FS::Record qw(qsearch qsearchs); -use FS::part_pkg::flat; - -@ISA = qw(FS::part_pkg::flat); - -%info = ( - 'disabled' => 1, #internal session db deprecated (or at least on hold) - 'name' => 'Base charge plus charge per-hour from the session monitor', - 'shortname' => 'Session monitor (per-hour)', - 'inherit_fields' => [ 'global_Mixin' ], - 'fields' => { - 'recur_included_hours' => { 'name' => 'Hours included', - 'default' => 0, - }, - 'recur_hourly_charge' => { 'name' => 'Additional charge per hour', - 'default' => 0, - }, - }, - 'fieldorder' => [ '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_fee.value + \' + \' + what.recur_hourly_charge.value + \' * $hours;\'', - 'weight' => 80, -); - -sub price_info { - my $self = shift; - my $str = $self->SUPER::price_info; - $str .= " plus usage" if $str; - $str; -} - -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_fee') + $hours * $self->option('recur_hourly_charge'); - -} - -sub can_discount { 0; } - -sub is_free_options { - qw( setup_fee recur_fee recur_hourly_charge ); -} - -sub base_recur { - my($self, $cust_pkg) = @_; - $self->option('recur_fee'); -} - -1; diff --git a/FS/FS/part_pkg/sesmon_minute.pm b/FS/FS/part_pkg/sesmon_minute.pm deleted file mode 100644 index b86cffd76..000000000 --- a/FS/FS/part_pkg/sesmon_minute.pm +++ /dev/null @@ -1,56 +0,0 @@ -package FS::part_pkg::sesmon_minute; - -use strict; -use vars qw(@ISA %info); -#use FS::Record qw(qsearch qsearchs); -use FS::part_pkg::flat; - -@ISA = qw(FS::part_pkg::flat); - -%info = ( - 'disabled' => 1, #internal session db deprecated (or at least on hold) - 'name' => 'Base charge plus charge per-minute from the session monitor', - 'shortname' => 'Session monitor (per-minute)', - 'inherit_fields' => [ 'global_Mixin' ], - 'fields' => { - 'recur_included_min' => { 'name' => 'Minutes included', - 'default' => 0, - }, - 'recur_minly_charge' => { 'name' => 'Additional charge per minute', - 'default' => 0, - }, - }, - 'fieldorder' => [ '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_fee.value + \' + \' + what.recur_minly_charge.value + \' * $min;\'', - 'weight' => 80, -); - -sub price_info { - my $self = shift; - my $str = $self->SUPER::price_info; - $str .= " plus usage" if $str; - $str; -} - -sub calc_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_fee') + $min * $self->option('recur_minly_charge'); -} - -sub can_discount { 0; } - -sub is_free_options { - qw( setup_fee recur_fee recur_minly_charge ); -} - -sub base_recur { - my($self, $cust_pkg) = @_; - $self->option('recur_fee'); -} - -1; -- 2.11.0