remove old test files

10 files changed, 19 insertions, 37 deletions

diff --git a/FS/FS/ClientAPI.pm b/FS/FS/ClientAPI.pm
index 1fea28c67..c36fd5595 100644
--- a/FS/FS/ClientAPI.pm
+++ b/FS/FS/ClientAPI.pm
@@ -3,6 +3,7 @@ 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 );
 
@@ -35,9 +36,17 @@ 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';
-  &{$sub}(@_);
+  my $rv = &{$sub}(@_);
+
+  warn dbh->sprintProfile if dbh->can('sprintProfile');
+  dbh->{'private_profile'} = {};
+
+  $rv;
 }
 
 1;
diff --git a/FS/FS/payinfo_Mixin.pm b/FS/FS/payinfo_Mixin.pm
index 01b222634..e944099fb 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_cardtype") ) {
+  if ( ! FS::upgrade_journal->is_done("${table}__set_cardtype2") ) {
     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_cardtype");
+    FS::upgrade_journal->set_done("${table}__set_cardtype2");
   }
 }
 
@@ -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 ],
+    extra_sql => q[ WHERE payby IN('CARD','DCRD') AND ( paycardtype IS NULL or paycardtype = 'Not a credit card' ) ],
   });
   while (my $record = $search->fetch) {
     my $error = $record->replace;
diff --git a/FS/FS/pkg_referral.pm b/FS/FS/pkg_referral.pm
index a5ac79505..0983ff6e2 100644
--- a/FS/FS/pkg_referral.pm
+++ b/FS/FS/pkg_referral.pm
@@ -1,11 +1,9 @@
 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 7e373a0c3..e96f65a08 100755
--- a/FS/bin/freeside-selfservice-xmlrpcd
+++ b/FS/bin/freeside-selfservice-xmlrpcd
@@ -29,6 +29,11 @@ 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
deleted file mode 100644
index 0ce60c833..000000000
--- a/FS/t/InitHandler.t
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index fefa57eb4..000000000
--- a/FS/t/part_pkg-flat_comission.t
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index 05d3ac417..000000000
--- a/FS/t/part_pkg-flat_comission_cust.t
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index 851b58db1..000000000
--- a/FS/t/part_pkg-flat_comission_pkg.t
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index 4f02cfcf4..000000000
--- a/FS/t/part_pkg-sesmon_hour.t
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index 6ceaa3ce2..000000000
--- a/FS/t/part_pkg-sesmon_minute.t
+++ /dev/null
@@ -1,5 +0,0 @@
-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";