From af0778d5f900697e0a523c6f88b3b250d5a0d1c9 Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Sun, 16 Feb 2014 14:03:02 -0800 Subject: [PATCH] remove cust_recon --- FS/FS/Schema.pm | 34 ++------- FS/FS/cust_recon.pm | 193 ---------------------------------------------------- FS/t/cust_recon.t | 5 -- 3 files changed, 7 insertions(+), 225 deletions(-) delete mode 100644 FS/FS/cust_recon.pm delete mode 100644 FS/t/cust_recon.t diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm index 728b0ccbb..4211ee28f 100644 --- a/FS/FS/Schema.pm +++ b/FS/FS/Schema.pm @@ -1623,32 +1623,6 @@ sub tables_hashref { ], }, - 'cust_recon' => { # (some sort of not-well understood thing for OnPac) - 'columns' => [ - 'reconid', 'serial', '', '', '', '', - 'recondate', @date_type, '', '', - 'custnum', 'int' , '', '', '', '', - 'agentnum', 'int', '', '', '', '', - 'last', 'varchar', '', $char_d, '', '', - 'first', 'varchar', '', $char_d, '', '', - 'address1', 'varchar', '', $char_d, '', '', - 'address2', 'varchar', 'NULL', $char_d, '', '', - 'city', 'varchar', '', $char_d, '', '', - 'state', 'varchar', 'NULL', $char_d, '', '', - 'zip', 'varchar', 'NULL', 10, '', '', - 'pkg', 'varchar', 'NULL', $char_d, '', '', - 'adjourn', @date_type, '', '', - 'status', 'varchar', 'NULL', 10, '', '', - 'agent_custid', 'varchar', '', $char_d, '', '', - 'agent_pkg', 'varchar', 'NULL', $char_d, '', '', - 'agent_adjourn', @date_type, '', '', - 'comments', 'text', 'NULL', '', '', '', - ], - 'primary_key' => 'reconid', - 'unique' => [], - 'index' => [], - }, - 'contact_class' => { 'columns' => [ 'classnum', 'serial', '', '', '', '', @@ -4959,8 +4933,10 @@ sub tables_hashref { 'lastapp', 'varchar', '', $char_d, \"''", '', 'lastdata', 'varchar', '', 255, \"''", '', - #currently only opensips + #currently only opensips & voipswitch 'src_ip_addr', 'varchar', 'NULL', 15, '', '', + + #currently only opensips 'dst_ip_addr', 'varchar', 'NULL', 15, '', '', #currently only u4: @@ -5029,6 +5005,10 @@ sub tables_hashref { 'charged_party_imsi', 'varchar', 'NULL', $char_d, '', '', 'upstream_price', 'decimal', 'NULL', '10,5', '', '', + + #currently only voipswitch + #'upstream_rate', 'decimal', 'NULL', '10,5', '', '', + 'upstream_src_regionname', 'varchar', 'NULL', $char_d, '', '', 'upstream_dst_regionname', 'varchar', 'NULL', $char_d, '', '', diff --git a/FS/FS/cust_recon.pm b/FS/FS/cust_recon.pm deleted file mode 100644 index 0a1ca3ae2..000000000 --- a/FS/FS/cust_recon.pm +++ /dev/null @@ -1,193 +0,0 @@ -package FS::cust_recon; - -use strict; -use base qw( FS::Record ); -use FS::Record qw( qsearch qsearchs ); - -=head1 NAME - -FS::cust_recon - Object methods for cust_recon records - -=head1 SYNOPSIS - - use FS::cust_recon; - - $record = new FS::cust_recon \%hash; - $record = new FS::cust_recon { 'column' => 'value' }; - - $error = $record->insert; - - $error = $new_record->replace($old_record); - - $error = $record->delete; - - $error = $record->check; - -=head1 DESCRIPTION - -An FS::cust_recon object represents a customer reconcilation. FS::cust_recon -inherits from FS::Record. The following fields are currently supported: - -=over 4 - -=item reconid - -primary key - -=item recondate - -recondate - -=item custnum - -custnum - -=item agentnum - -agentnum - -=item last - -last - -=item first - -first - -=item address1 - -address1 - -=item address2 - -address2 - -=item city - -city - -=item state - -state - -=item zip - -zip - -=item pkg - -pkg - -=item adjourn - -adjourn - -=item status - -status - -=item agent_custid - -agent_custid - -=item agent_pkg - -agent_pkg - -=item agent_adjourn - -agent_adjourn - -=item comments - -comments - - -=back - -=head1 METHODS - -=over 4 - -=item new HASHREF - -Creates a new customer reconcilation. To add the reconcilation to the database, -see L<"insert">. - -Note that this stores the hash reference, not a distinct copy of the hash it -points to. You can ask the object for a copy with the I method. - -=cut - -sub table { 'cust_recon'; } - -=item insert - -Adds this record to the database. If there is an error, returns the error, -otherwise returns false. - -=cut - -=item delete - -Delete this record from the database. - -=cut - -=item replace OLD_RECORD - -Replaces the OLD_RECORD with this one in the database. If there is an error, -returns the error, otherwise returns false. - -=cut - -=item check - -Checks all fields to make sure this is a valid reconcilation. If there is -an error, returns the error, otherwise returns false. Called by the insert -and replace methods. - -=cut - -sub check { - my $self = shift; - - my $error = - $self->ut_numbern('reconid') - || $self->ut_numbern('recondate') - || $self->ut_number('custnum') - || $self->ut_number('agentnum') - || $self->ut_text('last') - || $self->ut_text('first') - || $self->ut_text('address1') - || $self->ut_textn('address2') - || $self->ut_text('city') - || $self->ut_textn('state') - || $self->ut_textn('zip') - || $self->ut_textn('pkg') - || $self->ut_numbern('adjourn') - || $self->ut_textn('status') - || $self->ut_text('agent_custid') - || $self->ut_textn('agent_pkg') - || $self->ut_numbern('agent_adjourn') - || $self->ut_textn('comments') - ; - return $error if $error; - - $self->SUPER::check; -} - -=back - -=head1 BUGS - -Possibly the existance of this module. - -=head1 SEE ALSO - -L, schema.html from the base documentation. - -=cut - -1; - diff --git a/FS/t/cust_recon.t b/FS/t/cust_recon.t deleted file mode 100644 index 3724736f4..000000000 --- a/FS/t/cust_recon.t +++ /dev/null @@ -1,5 +0,0 @@ -BEGIN { $| = 1; print "1..1\n" } -END {print "not ok 1\n" unless $loaded;} -use FS::cust_recon; -$loaded=1; -print "ok 1\n"; -- 2.11.0