From: ivan <ivan>
Date: Thu, 27 Jan 2005 23:01:16 +0000 (+0000)
Subject: s/defaultcountry/countrydefault/
X-Git-Tag: BEFORE_FINAL_MASONIZE~726
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=d35298e7ac78dff1fde4bf8e6d8f0104260a527e

s/defaultcountry/countrydefault/
---

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index fe2e1c228..a52e83db7 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -136,7 +136,7 @@ sub customer_info {
 
     my $conf = new FS::Conf;
     $return{small_custview} =
-      small_custview( $cust_main, $conf->config('defaultcountry') );
+      small_custview( $cust_main, $conf->config('countrydefault') );
 
     $return{name} = $cust_main->first. ' '. $cust_main->get('last');
 
@@ -221,7 +221,7 @@ sub payment_info {
   my $conf = new FS::Conf;
   my %states = map { $_->state => 1 }
                  qsearch('cust_main_county', {
-                   'country' => $conf->config('defaultcountry') || 'US'
+                   'country' => $conf->config('countrydefault') || 'US'
                  } );
 
   use vars qw($payment_info); #cache for performance
@@ -474,7 +474,7 @@ sub list_pkgs {
                         } $cust_main->ncancelled_pkgs
                   ],
     'small_custview' =>
-      small_custview( $cust_main, $conf->config('defaultcountry') ),
+      small_custview( $cust_main, $conf->config('countrydefault') ),
   };
 
 }
@@ -717,7 +717,7 @@ sub part_svc_info {
     'acstate'         => '',
 
     'small_custview' =>
-      small_custview( $cust_main, $conf->config('defaultcountry') ),
+      small_custview( $cust_main, $conf->config('countrydefault') ),
 
   };
 
@@ -747,7 +747,7 @@ sub unprovision_svc {
   return { 'svc'   => $cust_svc->part_svc->svc,
            'error' => $cust_svc->cancel,
            'small_custview' =>
-             small_custview( $cust_main, $conf->config('defaultcountry') ),
+             small_custview( $cust_main, $conf->config('countrydefault') ),
          };
 
 }
diff --git a/httemplate/misc/payment.cgi b/httemplate/misc/payment.cgi
index 02c6c5428..43eb600f9 100644
--- a/httemplate/misc/payment.cgi
+++ b/httemplate/misc/payment.cgi
@@ -22,7 +22,7 @@
    my $conf = new FS::Conf;
    my %states = map { $_->state => 1 }
                   qsearch('cust_main_county', {
-                    'country' => $conf->config('defaultcountry') || 'US'
+                    'country' => $conf->config('countrydefault') || 'US'
                   } );
    my @states = sort { $a cmp $b } keys %states;