summaryrefslogtreecommitdiff
path: root/FS
diff options
context:
space:
mode:
authorIvan Kohler <ivan@freeside.biz>2017-03-10 07:04:12 -0800
committerIvan Kohler <ivan@freeside.biz>2017-03-10 07:04:12 -0800
commitf77cbf2281ef5ea2e0b81b64fdd1dd78fca3e543 (patch)
tree36068bd5ddb2295dd9608f36831a3232a6f0e6bc /FS
parentc13b6c8f4b9876aa8f91e1c14d3c208ac0d189e9 (diff)
Revert "remove old test files"
This reverts commit c13b6c8f4b9876aa8f91e1c14d3c208ac0d189e9.
Diffstat (limited to 'FS')
-rw-r--r--FS/FS/ClientAPI.pm11
-rw-r--r--FS/FS/payinfo_Mixin.pm6
-rw-r--r--FS/FS/pkg_referral.pm4
-rwxr-xr-xFS/bin/freeside-selfservice-xmlrpcd5
-rw-r--r--FS/t/InitHandler.t5
-rw-r--r--FS/t/part_pkg-flat_comission.t5
-rw-r--r--FS/t/part_pkg-flat_comission_cust.t5
-rw-r--r--FS/t/part_pkg-flat_comission_pkg.t5
-rw-r--r--FS/t/part_pkg-sesmon_hour.t5
-rw-r--r--FS/t/part_pkg-sesmon_minute.t5
10 files changed, 37 insertions, 19 deletions
diff --git a/FS/FS/ClientAPI.pm b/FS/FS/ClientAPI.pm
index c36fd5595..1fea28c67 100644
--- a/FS/FS/ClientAPI.pm
+++ b/FS/FS/ClientAPI.pm
@@ -3,7 +3,6 @@ package FS::ClientAPI;
use strict;
use base 'Exporter';
use vars qw( @EXPORT_OK %handler $domain $DEBUG $me );
-use FS::UID qw( dbh );
@EXPORT_OK = qw( load_clientapi_modules );
@@ -36,17 +35,9 @@ sub dispatch {
my ( $self, $name ) = ( shift, shift );
$name =~ s(/)(::)g;
my $sub = "FS::ClientAPI::$name";
-
- dbh->{'private_profile'} = {};
-
warn "$me dispatch: calling $sub with args @_\n" if $DEBUG;
no strict 'refs';
- my $rv = &{$sub}(@_);
-
- warn dbh->sprintProfile if dbh->can('sprintProfile');
- dbh->{'private_profile'} = {};
-
- $rv;
+ &{$sub}(@_);
}
1;
diff --git a/FS/FS/payinfo_Mixin.pm b/FS/FS/payinfo_Mixin.pm
index e944099fb..01b222634 100644
--- a/FS/FS/payinfo_Mixin.pm
+++ b/FS/FS/payinfo_Mixin.pm
@@ -445,11 +445,11 @@ sub upgrade_set_cardtype {
my $class = shift;
my $table = $class->table or die "upgrade_set_cardtype needs a table";
- if ( ! FS::upgrade_journal->is_done("${table}__set_cardtype2") ) {
+ if ( ! FS::upgrade_journal->is_done("${table}__set_cardtype") ) {
my $job = FS::queue->new({ job => 'FS::payinfo_Mixin::process_set_cardtype' });
my $error = $job->insert($table);
die $error if $error;
- FS::upgrade_journal->set_done("${table}__set_cardtype2");
+ FS::upgrade_journal->set_done("${table}__set_cardtype");
}
}
@@ -461,7 +461,7 @@ sub process_set_cardtype {
local $ignore_masked_payinfo = 1;
my $search = FS::Cursor->new({
table => $table,
- extra_sql => q[ WHERE payby IN('CARD','DCRD') AND ( paycardtype IS NULL or paycardtype = 'Not a credit card' ) ],
+ extra_sql => q[ WHERE payby IN('CARD','DCRD') AND paycardtype IS NULL ],
});
while (my $record = $search->fetch) {
my $error = $record->replace;
diff --git a/FS/FS/pkg_referral.pm b/FS/FS/pkg_referral.pm
index 0983ff6e2..a5ac79505 100644
--- a/FS/FS/pkg_referral.pm
+++ b/FS/FS/pkg_referral.pm
@@ -1,9 +1,11 @@
package FS::pkg_referral;
-use base qw( FS::Record );
use strict;
+use vars qw( @ISA );
use FS::Record qw( dbh );
+@ISA = qw(FS::Record);
+
=head1 NAME
FS::pkg_referral - Object methods for pkg_referral records
diff --git a/FS/bin/freeside-selfservice-xmlrpcd b/FS/bin/freeside-selfservice-xmlrpcd
index e96f65a08..7e373a0c3 100755
--- a/FS/bin/freeside-selfservice-xmlrpcd
+++ b/FS/bin/freeside-selfservice-xmlrpcd
@@ -29,11 +29,6 @@ my $conf = new FS::Conf;
die "not running; selfservice-xmlrpc conf option is off\n"
unless $conf->exists('selfservice-xmlrpc');
-if ( $conf->exists('selfservice-db_profile') ) {
- eval "use DBIx::Profile";
- warn $@ if $@;
-}
-
daemon_run( 'port' => 8080, 'handle_request' =>
sub {
my $request = shift;
diff --git a/FS/t/InitHandler.t b/FS/t/InitHandler.t
new file mode 100644
index 000000000..0ce60c833
--- /dev/null
+++ b/FS/t/InitHandler.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::InitHandler;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/part_pkg-flat_comission.t b/FS/t/part_pkg-flat_comission.t
new file mode 100644
index 000000000..fefa57eb4
--- /dev/null
+++ b/FS/t/part_pkg-flat_comission.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_pkg::flat_comission;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/part_pkg-flat_comission_cust.t b/FS/t/part_pkg-flat_comission_cust.t
new file mode 100644
index 000000000..05d3ac417
--- /dev/null
+++ b/FS/t/part_pkg-flat_comission_cust.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_pkg::flat_comission_cust;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/part_pkg-flat_comission_pkg.t b/FS/t/part_pkg-flat_comission_pkg.t
new file mode 100644
index 000000000..851b58db1
--- /dev/null
+++ b/FS/t/part_pkg-flat_comission_pkg.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_pkg::flat_comission_pkg;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/part_pkg-sesmon_hour.t b/FS/t/part_pkg-sesmon_hour.t
new file mode 100644
index 000000000..4f02cfcf4
--- /dev/null
+++ b/FS/t/part_pkg-sesmon_hour.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_pkg::sesmon_hour;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/part_pkg-sesmon_minute.t b/FS/t/part_pkg-sesmon_minute.t
new file mode 100644
index 000000000..6ceaa3ce2
--- /dev/null
+++ b/FS/t/part_pkg-sesmon_minute.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_pkg::sesmon_minute;
+$loaded=1;
+print "ok 1\n";