[freeside-commits] freeside/FS/FS lata.pm, NONE, 1.1.2.2 did_vendor.pm, NONE, 1.1.2.2 did_order.pm, NONE, 1.1.2.2 Record.pm, 1.214.2.2, 1.214.2.3 Schema.pm, 1.239.2.18, 1.239.2.19 phone_avail.pm, 1.4.8.7, 1.4.8.8
Erik Levinson
levinse at wavetail.420.am
Sat Feb 12 23:19:53 PST 2011
Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv15258/FS/FS
Modified Files:
Tag: FREESIDE_2_1_BRANCH
Record.pm Schema.pm phone_avail.pm
Added Files:
Tag: FREESIDE_2_1_BRANCH
lata.pm did_vendor.pm did_order.pm
Log Message:
bulk DID orders and inventory, RT11291
--- NEW FILE: did_vendor.pm ---
package FS::did_vendor;
use strict;
use base qw( FS::Record );
use FS::Record qw( qsearch qsearchs );
=head1 NAME
FS::did_vendor - Object methods for did_vendor records
=head1 SYNOPSIS
use FS::did_vendor;
$record = new FS::did_vendor \%hash;
$record = new FS::did_vendor { 'column' => 'value' };
$error = $record->insert;
$error = $new_record->replace($old_record);
$error = $record->delete;
$error = $record->check;
=head1 DESCRIPTION
An FS::did_vendor object represents a bulk DID vendor. FS::did_vendor inherits from
FS::Record. The following fields are currently supported:
=over 4
=item vendornum
primary key
=item vendorname
vendorname
=back
=head1 METHODS
=over 4
=item new HASHREF
Creates a new bulk DID vendor. To add it 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 { 'did_vendor'; }
=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 bulk DID vendor. 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('vendornum')
|| $self->ut_text('vendorname')
;
return $error if $error;
$self->SUPER::check;
}
=back
=head1 BUGS
=head1 SEE ALSO
L<FS::Record>, schema.html from the base documentation.
=cut
1;
Index: phone_avail.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/phone_avail.pm,v
retrieving revision 1.4.8.7
retrieving revision 1.4.8.8
diff -u -w -d -r1.4.8.7 -r1.4.8.8
--- phone_avail.pm 16 Jan 2011 05:44:15 -0000 1.4.8.7
+++ phone_avail.pm 13 Feb 2011 07:19:51 -0000 1.4.8.8
@@ -145,7 +145,10 @@
|| $self->ut_numbern('nxx')
|| $self->ut_numbern('station')
|| $self->ut_foreign_keyn('svcnum', 'cust_svc', 'svcnum' )
+ || $self->ut_foreign_keyn('ordernum', 'did_order', 'ordernum' )
|| $self->ut_textn('availbatch')
+ || $self->ut_textn('name')
+ || $self->ut_textn('rate_center_abbrev')
;
return $error if $error;
@@ -187,8 +190,21 @@
};
my $opt = { 'table' => 'phone_avail',
- 'params' => [ 'availbatch', 'exportnum', 'countrycode' ],
- 'formats' => { 'default' => [ 'state', $numsub, 'name' ], },
+ 'params' => [ 'availbatch', 'exportnum', 'countrycode', 'ordernum' ],
+ 'formats' => { 'default' => [ 'state', $numsub, 'name' ],
+ 'bulk' => [ 'state', $numsub, 'name', 'rate_center_abbrev' ],
+ },
+ 'postinsert_callback' => sub {
+ my $record = shift;
+ if($record->ordernum) {
+ my $did_order = qsearchs('did_order',
+ { 'ordernum' => $record->ordernum } );
+ if($did_order && !$did_order->received) {
+ $did_order->received(time);
+ $did_order->replace;
+ }
+ }
+ },
};
FS::Record::process_batch_import( $job, $opt, @_ );
--- NEW FILE: lata.pm ---
package FS::lata;
use strict;
use base qw( FS::Record );
use FS::Record qw( qsearch qsearchs );
=head1 NAME
FS::lata - Object methods for lata records
=head1 SYNOPSIS
use FS::lata;
$record = new FS::lata \%hash;
$record = new FS::lata { 'column' => 'value' };
$error = $record->insert;
$error = $new_record->replace($old_record);
$error = $record->delete;
$error = $record->check;
=head1 DESCRIPTION
An FS::lata object represents a LATA number/name. FS::lata inherits from
FS::Record. The following fields are currently supported:
=over 4
=item latanum
primary key
=item description
description
=back
=head1 METHODS
=over 4
=item new HASHREF
Creates a new LATA. To add the LATA 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 { 'lata'; }
=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 LATA. 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('latanum')
|| $self->ut_text('description')
;
return $error if $error;
$self->SUPER::check;
}
=back
=head1 BUGS
=head1 SEE ALSO
L<FS::Record>, schema.html from the base documentation.
=cut
1;
Index: Record.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Record.pm,v
retrieving revision 1.214.2.2
retrieving revision 1.214.2.3
diff -u -w -d -r1.214.2.2 -r1.214.2.3
--- Record.pm 26 Dec 2010 04:09:33 -0000 1.214.2.2
+++ Record.pm 13 Feb 2011 07:19:51 -0000 1.214.2.3
@@ -1591,6 +1591,7 @@
params => { map { $_ => $param->{$_} } @pass_params },
#?
default_csv => $opt->{default_csv},
+ postinsert_callback => $opt->{postinsert_callback},
);
if ( $opt->{'batch_namecol'} ) {
@@ -1664,6 +1665,8 @@
my( $type, $header, $sep_char, $fixedlength_format,
$xml_format, $row_callback, @fields );
my $postinsert_callback = '';
+ $postinsert_callback = $param->{'postinsert_callback'}
+ if $param->{'postinsert_callback'};
if ( $param->{'format'} ) {
my $format = $param->{'format'};
@@ -1709,9 +1712,6 @@
$row_callback = '';
@fields = @{ $param->{'fields'} };
- $postinsert_callback = $param->{'postinsert_callback'}
- if $param->{'postinsert_callback'}
-
} else {
die "neither format nor fields specified";
}
Index: Schema.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Schema.pm,v
retrieving revision 1.239.2.18
retrieving revision 1.239.2.19
diff -u -w -d -r1.239.2.18 -r1.239.2.19
--- Schema.pm 27 Jan 2011 05:10:08 -0000 1.239.2.18
+++ Schema.pm 13 Feb 2011 07:19:51 -0000 1.239.2.19
@@ -2839,6 +2839,8 @@
'nxx', 'char', 'NULL', 3, '', '',
'station', 'char', 'NULL', 4, '', '',
'name', 'varchar', 'NULL', $char_d, '', '',
+ 'rate_center_abbrev', 'varchar', 'NULL', $char_d, '', '',
+ 'ordernum', 'int', 'NULL', '', '', '',
'svcnum', 'int', 'NULL', '', '', '',
'availbatch', 'varchar', 'NULL', $char_d, '', '',
],
@@ -2853,6 +2855,45 @@
],
},
+ 'lata' => {
+ 'columns' => [
+ 'latanum', 'int', '', '', '', '',
+ 'description', 'varchar', '', $char_d, '', '',
+ ],
+ 'primary_key' => 'latanum',
+ 'unique' => [],
+ 'index' => [],
+ },
+
+ 'did_vendor' => {
+ 'columns' => [
+ 'vendornum', 'serial', '', '', '', '',
+ 'vendorname', 'varchar', '', $char_d, '', '',
+ ],
+ 'primary_key' => 'vendornum',
+ 'unique' => [],
+ 'index' => [],
+ },
+
+ 'did_order' => {
+ 'columns' => [
+ 'ordernum', 'serial', '', '', '', '',
+ 'vendornum', 'int', '', '', '', '',
+ 'vendor_order_id', 'varchar', '', $char_d, '', '',
+ 'msa', 'varchar', 'NULL', $char_d, '', '',
+ 'latanum', 'int', 'NULL', '', '', '',
+ 'rate_center', 'varchar', 'NULL', $char_d, '', '',
+ 'state', 'char', 'NULL', 2, '', '',
+ 'quantity', 'int', '', '', '', '',
+ 'submitted', 'int', '', '', '', '',
+ 'confirmed', 'int', 'NULL', '', '', '',
+ 'received', 'int', 'NULL', '', '', '',
+ ],
+ 'primary_key' => 'ordernum',
+ 'unique' => [ [ 'vendornum', 'vendor_order_id' ] ],
+ 'index' => [],
+ },
+
'reason_type' => {
'columns' => [
'typenum', 'serial', '', '', '', '',
--- NEW FILE: did_order.pm ---
package FS::did_order;
use strict;
use base qw( FS::Record );
use FS::Record qw( qsearch qsearchs );
=head1 NAME
FS::did_order - Object methods for did_order records
=head1 SYNOPSIS
use FS::did_order;
$record = new FS::did_order \%hash;
$record = new FS::did_order { 'column' => 'value' };
$error = $record->insert;
$error = $new_record->replace($old_record);
$error = $record->delete;
$error = $record->check;
=head1 DESCRIPTION
An FS::did_order object represents a bulk DID order. FS::did_order inherits from
FS::Record. The following fields are currently supported:
=over 4
=item ordernum
primary key
=item vendornum
vendornum
=item vendor_order_id
vendor_order_id
=item msa
msa
=item latanum
latanum
=item rate_center
rate_center
=item state
state
=item quantity
quantity
=item submitted
submitted
=item confirmed
confirmed
=item received
received
=back
=head1 METHODS
=over 4
=item new HASHREF
Creates a new bulk DID order. To add it 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 { 'did_order'; }
=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 bulk DID order. 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('ordernum')
|| $self->ut_foreign_key('vendornum', 'did_vendor', 'vendornum' )
|| $self->ut_text('vendor_order_id')
|| $self->ut_textn('msa')
|| $self->ut_foreign_keyn('latanum', 'lata', 'latanum')
|| $self->ut_textn('rate_center')
|| $self->ut_textn('state')
|| $self->ut_number('quantity')
|| $self->ut_number('submitted')
|| $self->ut_numbern('confirmed')
|| $self->ut_numbern('received')
;
return $error if $error;
$self->SUPER::check;
}
=back
=head1 BUGS
=head1 SEE ALSO
L<FS::Record>, schema.html from the base documentation.
=cut
1;
More information about the freeside-commits
mailing list