X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FSetup.pm;h=c92ea41daefb29dbf8361dad834e7a5802914c24;hb=c8cccb4a92adceb943c635fe62dad0d034462ce0;hp=c53fe65b4531545d1f93a1f1cb8ac4aea6508aca;hpb=e5742a8ccfca16427631a45fc8895d6fc1a493dd;p=freeside.git

diff --git a/FS/FS/Setup.pm b/FS/FS/Setup.pm
index c53fe65b4..c92ea41da 100644
--- a/FS/FS/Setup.pm
+++ b/FS/FS/Setup.pm
@@ -71,13 +71,8 @@ sub populate_locales {
     my @states = $subcountry ? $subcountry->all_codes : undef;
   
     if ( !scalar(@states) || ( scalar(@states)==1 && !defined($states[0]) ) ) {
-  
-      my $cust_main_county = new FS::cust_main_county({
-        'tax'   => 0,
-        'country' => $country,
-      });  
-      my $error = $cust_main_county->insert;
-      die $error if $error;
+
+      _add_locale( 'country'=>$country );
   
     } else {
   
@@ -86,15 +81,7 @@ sub populate_locales {
       }
   
       foreach my $state ( @states ) {
-  
-        my $cust_main_county = new FS::cust_main_county({
-          'state' => $state,
-          'tax'   => 0,
-          'country' => $country,
-        });  
-        my $error = $cust_main_county->insert;
-        die $error if $error;
-  
+        _add_locale( 'country'=>$country, 'state'=>$state);
       }
     
     }
@@ -102,6 +89,34 @@ sub populate_locales {
 
 }
 
+sub populate_addl_locales {
+
+  my %addl = (
+    'US' => {
+      'FM' => 'Federated States of Micronesia',
+      'MH' => 'Federated States of Micronesia',
+      'PW' => 'Federated States of Micronesia',
+      'AA' => "Armed Forces Americas (except Canada)",
+      'AE' => "Armed Forces Europe / Canada / Middle East / Africa",
+      'AP' => "Armed Forces Pacific",
+    },
+  );
+
+  foreach my $country ( keys %addl ) {
+    foreach my $state ( keys %{ $addl{$country} } ) {
+      # $longname = $addl{$country}{$state};
+      _add_locale( 'country'=>$country, 'state'=>$state);
+    }
+  }
+
+}
+
+sub _add_locale {
+  my $cust_main_county = new FS::cust_main_county( { 'tax'=>0, @_ });  
+  my $error = $cust_main_county->insert;
+  die $error if $error;
+}
+
 sub populate_initial_data {
   my %opt = @_;
 
@@ -143,7 +158,7 @@ sub initial_data {
       { 'payby'     => 'CARD',
         'event'     => 'Batch card',
         'seconds'   => 0,
-        'eventcode' => '$cust_bill->batch_card();',
+        'eventcode' => '$cust_bill->batch_card(%options);',
         'weight'    => 40,
         'plan'      => 'batch-card',
       },
@@ -168,6 +183,20 @@ sub initial_data {
         'weight'    => 50,
         'plan'      => 'send',
       },
+      { 'payby'     => 'DCLN',
+        'event'     => 'Suspend',
+        'seconds'   => 0,
+        'eventcode' => '$cust_bill->suspend();',
+        'weight'    => 40,
+        'plan'      => 'suspend',
+      },
+      #{ 'payby'     => 'DCLN',
+      #  'event'     => 'Retriable',
+      #  'seconds'   => 0,
+      #  'eventcode' => '$cust_bill_event->retriable();',
+      #  'weight'    => 60,
+      #  'plan'      => 'retriable',
+      #},
     ],
     
     #you must create a service definition. An example of a service definition
@@ -306,7 +335,7 @@ sub populate_access {
 
   #foreach my $agent ( qsearch('agent', {} ) ) {
     my $access_groupagent = new FS::access_groupagent {
-      'groupnum' => $supergroup->groupnum,
+      'groupnum' => 1, #$supergroup->groupnum,
       'agentnum' => 1, #$agent->agentnum,
     };
     my $aga_error = $access_groupagent->insert;