[freeside-commits] freeside/FS/FS Schema.pm, 1.239.2.14, 1.239.2.15 svc_domain.pm, 1.74.2.1, 1.74.2.2

[Erik Levinson]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv6936/FS/FS

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	Schema.pm svc_domain.pm 
Log Message:
Add experimental OpenSRS export changes, and svc_domain UI changes for .au registrations

Index: Schema.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Schema.pm,v
retrieving revision 1.239.2.14
retrieving revision 1.239.2.15
diff -u -w -d -r1.239.2.14 -r1.239.2.15
--- Schema.pm	18 Jan 2011 03:44:31 -0000	1.239.2.14
+++ Schema.pm	19 Jan 2011 21:50:04 -0000	1.239.2.15
@@ -1775,6 +1775,8 @@
 	'setup_date',      @date_type, '', '',
 	'renewal_interval', 'int', 'NULL',       '', '', '',
 	'expiration_date', @date_type, '', '',
+	'au_registrant_name',       'varchar', 'NULL',  $char_d, '', '',
+	'au_eligibility_type',      'varchar', 'NULL',  $char_d, '', '',
         #communigate pro fields (quota = MaxAccountSize)
         'max_accounts',     'int', 'NULL',       '', '', '',
         'trailer',         'text', 'NULL',       '', '', '',

Index: svc_domain.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/svc_domain.pm,v
retrieving revision 1.74.2.1
retrieving revision 1.74.2.2
diff -u -w -d -r1.74.2.1 -r1.74.2.2
--- svc_domain.pm	8 Nov 2010 05:24:07 -0000	1.74.2.1
+++ svc_domain.pm	19 Jan 2011 21:50:04 -0000	1.74.2.2
@@ -89,6 +89,14 @@
 
 =item max_accounts
 
+=item au_eligibility_type
+
+AU-specific field for domain registrations
+
+=item au_registrant_name
+
+AU-specific field for domain registrations
+
 =back
 
 =head1 METHODS
@@ -118,6 +126,16 @@
                          disable_inventory => 1,
                          disable_select    => 1,
                        },
+      'au_registrant_name' => { label => 'AU Registrant Name',
+			        disable_inventory => 1,
+				disable_select => 1,
+			      },
+      'au_eligibility_type' => { label => 'AU Eligibility Type',
+                             type  => 'select',
+                             select_list => __PACKAGE__->au_eligibility_type_values,
+                             disable_inventory => 1,
+                             disable_select    => 1,
+			      },
       'max_accounts' => { label => 'Maximum number of accounts',
                           'disable_inventory' => 1,
                         },
@@ -287,6 +305,41 @@
   $class->search_sql_field('domain', $string);
 }
 
+=item au_eligibility_type_values
+
+=cut
+
+sub au_eligibility_type_values {
+
+ [ '',
+   'Charity',
+   'Child Care Centre',
+   'Citizen/Resident',
+   'Club',
+   'Commercial Statutory Body',
+   'Company',
+   'Government School',
+   'Higher Education Institution',
+   'Incorporated Association',
+   'Industry Body',
+   'National Body',
+   'Non-Government School',
+   'Non-profit Organisation',
+   'Other',
+   'Partnership',
+   'Pending TM Owner',
+   'Political Party',
+   'Pre-school',
+   'Registered Business',
+   'Religious/Church Group',
+   'Research Organisation',
+   'Sole Trader',
+   'Trade Union',
+   'Trademark Owner',
+   'Training Organisation',
+  ];
+
+}
 
 =item label
 
@@ -523,6 +576,8 @@
   #my $part_svc = $x;
 
   my $error = $self->ut_numbern('svcnum')
+              || $self->ut_textn('au_eligibility_type')
+              || $self->ut_textn('au_registrant_name')
               || $self->ut_numbern('catchall')
               || $self->ut_numbern('max_accounts')
               || $self->ut_anything('trailer') #well