[freeside-commits] freeside/FS/FS Conf.pm, 1.403, 1.404 Mason.pm, 1.60, 1.61 Schema.pm, 1.252, 1.253 cust_main.pm, 1.569, 1.570 cust_main_note.pm, 1.5, 1.6 cust_note_class.pm, NONE, 1.1
Erik Levinson
levinse at wavetail.420.am
Thu Dec 9 22:02:53 PST 2010
Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv31276/FS/FS
Modified Files:
Conf.pm Mason.pm Schema.pm cust_main.pm cust_main_note.pm
Added Files:
cust_note_class.pm
Log Message:
implement customer note classes, RT9995
Index: Conf.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Conf.pm,v
retrieving revision 1.403
retrieving revision 1.404
diff -u -w -d -r1.403 -r1.404
--- Conf.pm 7 Dec 2010 22:26:16 -0000 1.403
+++ Conf.pm 10 Dec 2010 06:02:50 -0000 1.404
@@ -4091,6 +4091,18 @@
'type' => 'checkbox',
},
+ {
+ 'key' => 'note-classes',
+ 'section' => 'UI',
+ 'description' => 'Use customer note classes',
+ 'type' => 'select',
+ 'select_hash' => [
+ 0 => 'Disabled',
+ 1 => 'Enabled',
+ 2 => 'Enabled, with tabs',
+ ],
+ },
+
{ key => "apacheroot", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
{ key => "apachemachine", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
{ key => "apachemachines", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
Index: cust_main_note.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main_note.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -d -r1.5 -r1.6
--- cust_main_note.pm 4 Apr 2010 23:27:35 -0000 1.5
+++ cust_main_note.pm 10 Dec 2010 06:02:51 -0000 1.6
@@ -4,6 +4,7 @@
use base qw( FS::otaker_Mixin FS::Record );
use Carp;
use FS::Record qw( qsearch qsearchs );
+use FS::cust_note_class;
=head1 NAME
@@ -38,6 +39,8 @@
=item custnum
+=item classnum
+
=item _date
=item usernum
@@ -106,6 +109,7 @@
my $error =
$self->ut_numbern('notenum')
|| $self->ut_number('custnum')
+ || $self->ut_foreign_keyn('classnum', 'cust_note_class', 'classnum')
|| $self->ut_numbern('_date')
|| $self->ut_textn('otaker')
|| $self->ut_anything('comments')
@@ -115,6 +119,36 @@
$self->SUPER::check;
}
+=item cust_note_class
+
+Returns the customer note class, as an FS::cust_note_class object, or the empty
+string if there is no note class.
+
+=cut
+
+sub cust_note_class {
+ my $self = shift;
+ if ( $self->classnum ) {
+ qsearchs('cust_note_class', { 'classnum' => $self->classnum } );
+ } else {
+ return '';
+ }
+}
+
+=item classname
+
+Returns the customer note class name, or the empty string if there is no
+customer note class.
+
+=cut
+
+sub classname {
+ my $self = shift;
+ my $cust_note_class = $self->cust_note_class;
+ $cust_note_class ? $cust_note_class->classname : '';
+}
+
+
#false laziness w/otaker_Mixin & cust_attachment
sub otaker {
my $self = shift;
Index: Mason.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Mason.pm,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -w -d -r1.60 -r1.61
--- Mason.pm 8 Dec 2010 21:37:44 -0000 1.60
+++ Mason.pm 10 Dec 2010 06:02:50 -0000 1.61
@@ -263,6 +263,7 @@
use FS::qual_option;
use FS::dsl_note;
use FS::part_pkg_vendor;
+ use FS::cust_note_class;
# Sammath Naur
if ( $FS::Mason::addl_handler_use ) {
--- NEW FILE: cust_note_class.pm ---
package FS::cust_note_class;
use strict;
use base qw( FS::class_Common );
use FS::cust_main_note;
=head1 NAME
FS::cust_note_class - Object methods for cust_note_class records
=head1 SYNOPSIS
use FS::cust_note_class;
$record = new FS::cust_note_class \%hash;
$record = new FS::cust_note_class { 'column' => 'value' };
$error = $record->insert;
$error = $new_record->replace($old_record);
$error = $record->delete;
$error = $record->check;
=head1 DESCRIPTION
An FS::cust_note_class object represents a customer note class. Every customer
note (see L<FS::cust_main_note) has, optionally, a note class. This class
inherits from FS::class_Common. The following fields are currently supported:
=over 4
=item classnum
primary key
=item classname
classname
=item disabled
disabled
=back
=head1 METHODS
=over 4
=item new HASHREF
Creates a new customer note class. To add the note class 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
sub table { 'cust_note_class'; }
sub _target_table { 'cust_main_note'; }
=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 note class. If there is
an error, returns the error, otherwise returns false. Called by the insert
and replace methods.
=cut
=back
=head1 BUGS
=head1 SEE ALSO
L<FS::cust_main_note>, L<FS::Record>, schema.html from the base documentation.
=cut
1;
Index: cust_main.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main.pm,v
retrieving revision 1.569
retrieving revision 1.570
diff -u -w -d -r1.569 -r1.570
--- cust_main.pm 5 Nov 2010 22:58:50 -0000 1.569
+++ cust_main.pm 10 Dec 2010 06:02:51 -0000 1.570
@@ -2209,12 +2209,13 @@
=cut
sub notes {
- my $self = shift;
- #order by?
+ my($self,$orderby_classnum) = (shift,shift);
+ my $orderby = "_DATE DESC";
+ $orderby = "CLASSNUM ASC, $orderby" if $orderby_classnum;
qsearch( 'cust_main_note',
{ 'custnum' => $self->custnum },
'',
- 'ORDER BY _DATE DESC'
+ "ORDER BY $orderby",
);
}
Index: Schema.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Schema.pm,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -w -d -r1.252 -r1.253
--- Schema.pm 8 Dec 2010 21:37:44 -0000 1.252
+++ Schema.pm 10 Dec 2010 06:02:50 -0000 1.253
@@ -932,6 +932,7 @@
'columns' => [
'notenum', 'serial', '', '', '', '',
'custnum', 'int', '', '', '', '',
+ 'classnum', 'int', 'NULL', '', '', '',
'_date', @date_type, '', '',
'otaker', 'varchar', 'NULL', 32, '', '',
'usernum', 'int', 'NULL', '', '', '',
@@ -942,6 +943,17 @@
'index' => [ [ 'custnum' ], [ '_date' ], [ 'usernum' ], ],
},
+ 'cust_note_class' => {
+ 'columns' => [
+ 'classnum', 'serial', '', '', '', '',
+ 'classname', 'varchar', '', $char_d, '', '',
+ 'disabled', 'char', 'NULL', 1, '', '',
+ ],
+ 'primary_key' => 'classnum',
+ 'unique' => [],
+ 'index' => [ ['disabled'] ],
+ },
+
'cust_category' => {
'columns' => [
'categorynum', 'serial', '', '', '', '',
More information about the freeside-commits
mailing list