X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FSchema.pm;h=316db6fb2d7fd27877c38d24a6b5810a969a461e;hp=ee434d76eae79bb1777ea7677763c5598c1fbef6;hb=5d20de9563b173877e6419934f2b63332da2dc49;hpb=ce18f284969a1eaed7985a91123a275a57090e12

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index ee434d76e..316db6fb2 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -887,6 +887,7 @@ sub tables_hashref {
         'billday',   'int', 'NULL', '', '', '',
         'edit_subject', 'char', 'NULL', 1, '', '',
         'locale', 'varchar', 'NULL', 16, '', '', 
+        'calling_list_exempt', 'char', 'NULL', 1, '', '',
       ],
       'primary_key' => 'custnum',
       'unique' => [ [ 'agentnum', 'agent_custid' ] ],
@@ -1381,19 +1382,19 @@ sub tables_hashref {
 
     'pay_batch' => { #batches of payments to an external processor
       'columns' => [
-        'batchnum',   'serial',    '',   '', '', '', 
-	'payby',      'char',      '',    4, '', '', # CARD/CHEK
-        'status',     'char', 'NULL',     1, '', '', 
-        'download',   @date_type, '', '', 
-        'upload',     @date_type, '', '', 
+        'batchnum', 'serial',     '', '', '', '', 
+        'agentnum',    'int', 'NULL', '', '', '', 
+	'payby',      'char',     '',  4, '', '', # CARD/CHEK
+        'status',     'char', 'NULL',  1, '', '', 
+        'download',       @date_type,     '', '', 
+        'upload',         @date_type,     '', '', 
       ],
       'primary_key' => 'batchnum',
       'unique' => [],
       'index' => [],
     },
 
-    'cust_pay_batch' => { #what's this used for again?  list of customers
-                          #in current CARD batch? (necessarily CARD?)
+    'cust_pay_batch' => { #list of customers in current CARD/CHEK batch
       'columns' => [
         'paybatchnum',   'serial',    '',   '', '', '', 
         'batchnum',   'int',    '',   '', '', '', 
@@ -2242,29 +2243,31 @@ sub tables_hashref {
 
     'nas' => {
       'columns' => [
-        'nasnum',   'serial',     '',    '', '', '', 
-        'nas',      'varchar', '',    $char_d, '', '', 
-        'nasip',    'varchar', '',    15, '', '', 
-        'nasfqdn',  'varchar', '',    $char_d, '', '', 
-        'last',     'int',     '',    '', '', '', 
+        'nasnum',       'serial',     '',  '',              '', '', 
+        'nasname',     'varchar',     '', 128,              '', '',
+        'shortname',   'varchar', 'NULL',  32,              '', '',
+        'type',        'varchar',     '',  30,         'other', '',
+        'ports',           'int', 'NULL',  '',              '', '',
+        'secret',      'varchar',     '',  60,        'secret', '',
+        'server',      'varchar', 'NULL',  64,              '', '',
+        'community',   'varchar', 'NULL',  50,              '', '',
+        'description', 'varchar',     '', 200, 'RADIUS Client', '',
       ],
       'primary_key' => 'nasnum',
-      'unique'      => [ [ 'nas' ], [ 'nasip' ] ],
-      'index'       => [ [ 'last' ] ],
+      'unique'      => [ [ 'nasname' ], ],
+      'index'       => [],
     },
 
-#    'session' => {
-#      'columns' => [
-#        'sessionnum', 'serial',       '',   '', '', '', 
-#        'portnum',    'int',       '',   '', '', '', 
-#        'svcnum',     'int',       '',   '', '', '', 
-#        'login',      @date_type, '', '', 
-#        'logout',     @date_type, '', '', 
-#      ],
-#      'primary_key' => 'sessionnum',
-#      'unique'      => [],
-#      'index'       => [ [ 'portnum' ] ],
-#    },
+    'export_nas' => {
+      'columns' => [
+        'exportnasnum', 'serial', '', '', '', '', 
+        'exportnum',       'int', '', '', '', '', 
+        'nasnum',          'int', '', '', '', '', 
+      ],
+      'primary_key' => 'exportnasnum',
+      'unique'      => [ [ 'exportnum', 'nasnum' ] ],
+      'index'       => [ [ 'exportnum' ], [ 'nasnum' ] ],
+    },
 
     'queue' => {
       'columns' => [