X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FSetup.pm;h=5e28c136313a2582147b6b3b8380b27e997bb04a;hb=0692ff47a2eac65616bf24104a51e558506f1b8f;hp=e2c5a5a2c7b9b783f270d59c6051723e46d8e317;hpb=396f1ea03ba712d59e603ac7608a16aa4e02cc09;p=freeside.git

diff --git a/FS/FS/Setup.pm b/FS/FS/Setup.pm
index e2c5a5a2c..5e28c1363 100644
--- a/FS/FS/Setup.pm
+++ b/FS/FS/Setup.pm
@@ -1,19 +1,32 @@
 package FS::Setup;
+use base qw( Exporter );
 
 use strict;
-use vars qw( @ISA @EXPORT_OK );
-use Exporter;
+use vars qw( ISA @EXPORT_OK );
 #use Tie::DxHash;
 use Tie::IxHash;
 use Crypt::OpenSSL::RSA;
 use FS::UID qw( dbh driver_name );
-use FS::Record;
+#use FS::Record;
 
 use FS::svc_domain;
 $FS::svc_domain::whois_hack = 1;
 $FS::svc_domain::whois_hack = 1;
 
-@ISA = qw( Exporter );
+#populate_locales
+use Locale::Country;
+use Locale::SubCountry 1.42;
+use FS::cust_main_county;
+
+#populate_access
+use FS::AccessRight;
+use FS::access_right;
+use FS::access_groupagent;
+
+#populate_msgcat
+use FS::Record qw(qsearch);
+use FS::msgcat;
+
 @EXPORT_OK = qw( create_initial_data enable_encryption );
 
 =head1 NAME
@@ -93,9 +106,6 @@ sub populate_numbering {
 
 sub populate_locales {
 
-  use Locale::Country;
-  use FS::cust_main_county;
-
   #cust_main_county
   foreach my $country ( sort map uc($_), all_country_codes ) {
     _add_country($country);
@@ -127,8 +137,6 @@ sub populate_addl_locales {
 
 sub _add_country {
 
-  use Locale::SubCountry 1.42;
-
   my( $country ) = shift;
 
   my $subcountry = eval { new Locale::SubCountry($country) };
@@ -209,6 +217,14 @@ sub populate_initial_data {
 sub initial_data {
   my %opt = @_;
 
+  my $cust_location = FS::cust_location->new({
+      'address1'  => '1234 System Lane',
+      'city'      => 'Systemtown',
+      'state'     => 'CA',
+      'zip'       => '54321',
+      'country'   => 'US',
+  });
+
   #tie my %hash, 'Tie::DxHash', 
   tie my %hash, 'Tie::IxHash', 
 
@@ -351,14 +367,11 @@ sub initial_data {
         'refnum'    => 1, #XXX
         'first'     => 'System',
         'last'      => 'Accounts',
-        'address1'  => '1234 System Lane',
-        'city'      => 'Systemtown',
-        'state'     => 'CA',
-        'zip'       => '54321',
-        'country'   => 'US',
         'payby'     => 'COMP',
         'payinfo'   => 'system', #or something
         'paydate'   => '1/2037',
+        'bill_location' => $cust_location,
+        'ship_location' => $cust_location,
       },
     ],
 
@@ -395,6 +408,9 @@ sub initial_data {
     #phone types
     'phone_type' => [],
 
+    #message templates
+    'msg_template' => [],
+
   ;
 
   \%hash;
@@ -403,9 +419,6 @@ sub initial_data {
 
 sub populate_access {
 
-  use FS::AccessRight;
-  use FS::access_right;
-
   foreach my $rightname ( FS::AccessRight->default_superuser_rights ) {
     my $access_right = new FS::access_right {
       'righttype'   => 'FS::access_group',
@@ -429,9 +442,6 @@ sub populate_access {
 
 sub populate_msgcat {
 
-  use FS::Record qw(qsearch);
-  use FS::msgcat;
-
   foreach my $del_msgcat ( qsearch('msgcat', {}) ) {
     my $error = $del_msgcat->delete;
     die $error if $error;