[freeside-commits] freeside/FS/FS Schema.pm, 1.199, 1.200 rate_detail.pm, 1.11, 1.12

[Ivan,,,]

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

Modified Files:
	Schema.pm rate_detail.pm 
Log Message:
connection fee for initial N seconds support, RT#7018

Index: Schema.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Schema.pm,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -w -d -r1.199 -r1.200
--- Schema.pm	18 Mar 2010 07:59:51 -0000	1.199
+++ Schema.pm	21 Mar 2010 23:13:24 -0000	1.200
@@ -2131,8 +2131,9 @@
         'orig_regionnum',  'int', 'NULL', '', '', '', 
         'dest_regionnum',  'int',     '', '', '', '', 
         'min_included',    'int',     '', '', '', '', 
-        #'min_charge',      @money_type, '', '', 
-        'min_charge',      'decimal', '', '10,5', '', '', 
+        'conn_charge',     @money_type, '0', '', #'decimal','','10,5','0','',
+        'conn_sec',        'int',     '',     '', '0', '',
+        'min_charge',      'decimal', '', '10,5', '', '', #@money_type, '', '', 
         'sec_granularity', 'int',     '', '', '', '', 
         #time period (link to table of periods)?
         'classnum',        'int',     'NULL', '', '', '', 

Index: rate_detail.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/rate_detail.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -d -r1.11 -r1.12
--- rate_detail.pm	5 May 2009 10:40:15 -0000	1.11
+++ rate_detail.pm	21 Mar 2010 23:13:24 -0000	1.12
@@ -232,6 +232,31 @@
   %granularities;
 }
 
+=item conn_secs
+
+  Returns an (ordered) hash of conn_sec => name pairs
+
+=cut
+
+tie my %conn_secs, 'Tie::IxHash',
+    '0' => 'connection',
+    '1' => 'first second',
+    '6' => 'first 6 seconds',
+   '30' => 'first 30 seconds', # '1/2 minute',
+   '60' => 'first minute',
+  '120' => 'first 2 minutes',
+  '180' => 'first 3 minutes',
+  '300' => 'first 5 minutes',
+;
+
+sub conn_secs {
+  %conn_secs;
+}
+
+=item process_edit_import
+
+=cut
+
 use Storable qw(thaw);
 use Data::Dumper;
 use MIME::Base64;
@@ -311,6 +336,10 @@
 
 }
 
+=item edit_import
+
+=cut
+
 #false laziness w/ #FS::Record::batch_import, grep "edit_import" for differences
 #could be turned into callbacks or something
 use Text::CSV_XS;
@@ -569,8 +598,6 @@
 
 }
 
-
-
 =back
 
 =head1 BUGS