X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=bin%2Ffs-setup;h=d21b41d3d7bd8681de6c44c68451aa8f3f955ce0;hb=ce11defad5298448b5c62c7e40fa1d0351f2af8a;hp=7a5403b012a9fb929334763a5f624ccb172c3777;hpb=532db8ddd43eae7f09200ad25fbc542524f2093d;p=freeside.git diff --git a/bin/fs-setup b/bin/fs-setup index 7a5403b01..d21b41d3d 100755 --- a/bin/fs-setup +++ b/bin/fs-setup @@ -1,6 +1,6 @@ #!/usr/bin/perl -Tw # -# $Id: fs-setup,v 1.15 1999-02-27 21:06:21 ivan Exp $ +# $Id: fs-setup,v 1.17 1999-04-14 07:58:39 ivan Exp $ # # ivan@sisd.com 97-nov-8,9 # @@ -32,7 +32,13 @@ # fix radius attributes ivan@sisd.com 98-sep-27 # # $Log: fs-setup,v $ -# Revision 1.15 1999-02-27 21:06:21 ivan +# Revision 1.17 1999-04-14 07:58:39 ivan +# export getsecrets from FS::UID instead of calling it explicitly +# +# Revision 1.16 1999/02/28 19:44:16 ivan +# constructors s/create/new/ pointed out by "Bao C. Ha" +# +# Revision 1.15 1999/02/27 21:06:21 ivan # cust_main.paydate should be varchar(10), not @date_type ; problem reported # by Ben Leibig # @@ -79,14 +85,14 @@ BEGIN { $FS::Record::setup_hack = 1; } use strict; use DBI; use FS::dbdef; -use FS::UID qw(adminsuidsetup datasrc checkeuid); +use FS::UID qw(adminsuidsetup datasrc checkeuid getsecrets); use FS::Record; use FS::cust_main_county; die "Not running uid freeside!" unless checkeuid(); my $user = shift or die &usage; -FS::UID::getsecrets $user; +getsecrets($user); #needs to match FS::Record my($dbdef_file) = "/usr/local/etc/freeside/dbdef.". datasrc; @@ -228,7 +234,7 @@ AL AK AS AZ AR CA CO CT DC DE FM FL GA GU HI ID IL IN IA KS KY LA ME MH MD MA MI MN MS MO MT NC ND NE NH NJ NM NV NY MP OH OK OR PA PW PR RI SC SD TN TX TT UT VT VI VA WA WV WI WY AE AA AP ) ) { - my($cust_main_county)=create FS::cust_main_county({ + my($cust_main_county)=new FS::cust_main_county({ 'state' => $_, 'tax' => 0, 'country' => 'US', @@ -242,7 +248,7 @@ SC SD TN TX TT UT VT VI VA WA WV WI WY AE AA AP foreach ( qw( VIC NSW NT QLD TAS ACT WA SA ) ) { - my($cust_main_county)=create FS::cust_main_county({ + my($cust_main_county)=new FS::cust_main_county({ 'state' => $_, 'tax' => 0, 'country' => 'AU', @@ -265,7 +271,7 @@ ST SA SN SC SL SG SK SI SB SO ZA GS ES LK SH PM SD SR SJ SZ SE CH SY TW TJ TZ TH TG TK TO TT TN TR TM TC TV UG UA AE GB UM UY UZ VU VA VE VN VG VI WF EH YE YU ZR ZM ZW ) ) { - my($cust_main_county)=create FS::cust_main_county({ + my($cust_main_county)=new FS::cust_main_county({ 'tax' => 0, 'country' => $_, });