[freeside-commits] freeside/FS/FS Mason.pm, 1.58, 1.59 Schema.pm, 1.247, 1.248 dsl_note.pm, NONE, 1.1 svc_dsl.pm, 1.4, 1.5

[Erik Levinson]

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

Modified Files:
	Mason.pm Schema.pm svc_dsl.pm 
Added Files:
	dsl_note.pm 
Log Message:
move DSL notes into a dsl_note table, implement partial ikano dsl_pull


--- NEW FILE: dsl_note.pm ---
package FS::dsl_note;

use strict;
use base qw( FS::Record );
use FS::Record qw( qsearch qsearchs );

=head1 NAME

FS::dsl_note - Object methods for dsl_note records

=head1 SYNOPSIS

  use FS::dsl_note;

  $record = new FS::dsl_note \%hash;
  $record = new FS::dsl_note { 'column' => 'value' };

  $error = $record->insert;

  $error = $new_record->replace($old_record);

  $error = $record->delete;

  $error = $record->check;

=head1 DESCRIPTION

An FS::dsl_note object represents a DSL order note.  FS::dsl_note inherits from
FS::Record.  The following fields are currently supported:

=over 4

=item notenum - primary key

=item svcnum - the DSL for this note, see L<FS::svc_dsl>

=item by - export-specific, e.g. note's author or ISP vs. telco/vendor

=item priority - export-specific, e.g. high priority or not; not used by most

=item date - note date

=item note - the note


=back

=head1 METHODS

=over 4

=item new HASHREF

Creates a new note.  To add the note 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<hash> method.

=cut

# the new method can be inherited from FS::Record, if a table method is defined

sub table { 'dsl_note'; }

=item insert

Adds this record to the database.  If there is an error, returns the error,
otherwise returns false.

=cut

# the insert method can be inherited from FS::Record

=item delete

Delete this record from the database.

=cut

# the delete method can be inherited from FS::Record

=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

# the replace method can be inherited from FS::Record

=item check

Checks all fields to make sure this is a valid note.  If there is
an error, returns the error, otherwise returns false.  Called by the insert
and replace methods.

=cut

# the check method should currently be supplied - FS::Record contains some
# data checking routines

sub check {
  my $self = shift;

  my $error = 
    $self->ut_numbern('notenum')
    || $self->ut_foreign_key('svcnum', 'svc_dsl', 'svcnum')
    || $self->ut_textn('by')
    || $self->ut_alphasn('priority')
    || $self->ut_numbern('date')
    || $self->ut_text('note')
  ;
  return $error if $error;

  $self->SUPER::check;
}

=back

=head1 SEE ALSO

L<FS::Record>, schema.html from the base documentation.

=cut

1;


Index: Schema.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Schema.pm,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -w -d -r1.247 -r1.248
--- Schema.pm	28 Nov 2010 20:08:49 -0000	1.247
+++ Schema.pm	29 Nov 2010 02:30:38 -0000	1.248
@@ -1861,13 +1861,25 @@
         'staticips',             'text', 'NULL', '',  '', '',
         'monitored',   	'char', 'NULL',       1,  '', '', 
 	'last_pull',     'int', 'NULL',       '', '', '',
-	'notes',     'text', 'NULL',       '', '', '',
       ],
       'primary_key' => 'svcnum',
       'unique' => [ ],
       'index' => [ ['phonenum'], ['vendor_order_id'] ],
     },
 
+    'dsl_note' => {
+      'columns' => [
+        'notenum',           'serial',    '',        '', '', '',
+	'svcnum',     'int', '',       '', '', '',
+        'by',              'varchar', 'NULL', $char_d,  '', '',
+        'priority',   'char', 'NULL',       1,  '', '', 
+	'date',     'int', 'NULL',       '', '', '',
+	'note',     'text', '',       '', '', '',
+      ],
+      'primary_key' => 'notenum',
+      'unique' => [ ],
+      'index' => [ ['svcnum'] ],
+    },
 
     'domain_record' => {
       'columns' => [

Index: Mason.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Mason.pm,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -w -d -r1.58 -r1.59
--- Mason.pm	22 Nov 2010 20:53:21 -0000	1.58
+++ Mason.pm	29 Nov 2010 02:30:38 -0000	1.59
@@ -261,6 +261,7 @@
   use FS::svc_dsl;
   use FS::qual;
   use FS::qual_option;
+  use FS::dsl_note;
   # Sammath Naur
 
   if ( $FS::Mason::addl_handler_use ) {

Index: svc_dsl.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/svc_dsl.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -d -r1.4 -r1.5
--- svc_dsl.pm	28 Nov 2010 20:08:50 -0000	1.4
+++ svc_dsl.pm	29 Nov 2010 02:30:39 -0000	1.5
@@ -99,10 +99,6 @@
 
 =item last_pull - time of last data pull from vendor/telco
 
-=item notes
-
-DSL order notes placed by staff or vendor/telco on the vendor/telco order
-
 
 =back
 
@@ -171,7 +167,6 @@
 	    'monitored' => {	label => 'Monitored', 
 				type => 'checkbox', %dis2 },
 	    'last_pull' => { 	label => 'Last Pull', type => 'disabled' },
-	    'notes' => { 	label => 'Order Notes', %dis1 },
 	},
     };
 }
@@ -186,6 +181,16 @@
    return $self->svcnum;
 }
 
+=item notes
+
+Returns the set of FS::dsl_notes associated with this service
+
+=cut 
+sub notes {
+  my $self = shift;
+  qsearch( 'dsl_note', { 'svcnum' => $self->svcnum } );
+}
+
 =item insert
 
 Adds this record to the database.  If there is an error, returns the error,
@@ -250,7 +255,6 @@
     || $self->ut_textn('staticips')
     || $self->ut_enum('monitored',    [ '', 'Y' ])
     || $self->ut_numbern('last_pull')
-    || $self->ut_textn('notes')
   ;
   return $error if $error;