X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fsvc_domain.pm;h=b01d67310733d528d7096c8b298a83ce8defd36a;hp=a97f35bf8962483f16eb7822a56a3cb5ccacac4e;hb=57bb423fe457ba4e13726877f53bcdf944f828f8;hpb=246e76618447bb7ac436e9bfb8c0b042f9613326

diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index a97f35bf8..b01d67310 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -67,28 +67,54 @@ FS::svc_Common.  The following fields are currently supported:
 
 =over 4
 
-=item svcnum - primary key (assigned automatically for new accounts)
+=item svcnum
+
+primary key (assigned automatically for new accounts)
 
 =item domain
 
-=item catchall - optional svcnum of an svc_acct record, designating an email catchall account.
+=item catchall
+
+optional svcnum of an svc_acct record, designating an email catchall account.
+
+=item suffix
+
+=item parent_svcnum
+
+=item quota
+
+Storage limit
 
-=item suffix - 
+=item registrarnum
 
-=item parent_svcnum -
+Registrar (see L<FS::registrar>)
 
-=item registrarnum - Registrar (see L<FS::registrar>)
+=item registrarkey
 
-=item registrarkey - Registrar key or password for this domain
+Registrar key or password for this domain
 
-=item setup_date - UNIX timestamp
+=item setup_date
 
-=item renewal_interval - Number of days before expiration date to start renewal
+UNIX timestamp
 
-=item expiration_date - UNIX timestamp
+=item renewal_interval
+
+Number of days before expiration date to start renewal
+
+=item expiration_date
+
+UNIX timestamp
 
 =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,9 +144,24 @@ sub table_info {
                          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,
                         },
+      'quota'     => { 
+                         label => 'Quota', #storage limit
+                         type  => 'text',
+                         disable_inventory => 1,
+                     },
       'cgp_aliases' => { 
                          label => 'Communigate aliases',
                          type  => 'text',
@@ -287,6 +328,41 @@ sub search_sql {
   $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,8 +599,11 @@ sub check {
   #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_alphan('quota')
               || $self->ut_anything('trailer') #well
               || $self->ut_textn('cgp_aliases') #well
               || $self->ut_enum('acct_def_password_selfchange', [ '', 'Y' ])