projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
428faf8
)
Allow passing of 'allow_pkgpart' and 'import' flags up the chain to FS::cust_pkg...
author
Rob Van Dam
<rvandam00@gmail.com>
Thu, 17 Oct 2013 17:43:27 +0000
(11:43 -0600)
committer
Rob Van Dam
<rvandam00@gmail.com>
Thu, 17 Oct 2013 17:43:27 +0000
(11:43 -0600)
FS/FS/cust_main/Packages.pm
patch
|
blob
|
history
diff --git
a/FS/FS/cust_main/Packages.pm
b/FS/FS/cust_main/Packages.pm
index
152c496
..
a7418f7
100644
(file)
--- a/
FS/FS/cust_main/Packages.pm
+++ b/
FS/FS/cust_main/Packages.pm
@@
-1,7
+1,6
@@
package FS::cust_main::Packages;
use strict;
package FS::cust_main::Packages;
use strict;
-use vars qw( $DEBUG $me );
use List::Util qw( min );
use FS::UID qw( dbh );
use FS::Record qw( qsearch qsearchs );
use List::Util qw( min );
use FS::UID qw( dbh );
use FS::Record qw( qsearch qsearchs );
@@
-10,8
+9,7
@@
use FS::cust_svc;
use FS::contact; # for attach_pkgs
use FS::cust_location; #
use FS::contact; # for attach_pkgs
use FS::cust_location; #
-$DEBUG = 0;
-$me = '[FS::cust_main::Packages]';
+our ($DEBUG, $me) = (0, '[FS::cust_main::Packages]');
=head1 NAME
=head1 NAME
@@
-89,7
+87,7
@@
sub order_pkg {
if exists($opt->{'depend_jobnum'}) && $opt->{'depend_jobnum'};
my %insert_params = map { $opt->{$_} ? ( $_ => $opt->{$_} ) : () }
if exists($opt->{'depend_jobnum'}) && $opt->{'depend_jobnum'};
my %insert_params = map { $opt->{$_} ? ( $_ => $opt->{$_} ) : () }
- qw( ticket_subject ticket_queue allow_pkgpart );
+ qw( ticket_subject ticket_queue allow_pkgpart
import
);
local $SIG{HUP} = 'IGNORE';
local $SIG{INT} = 'IGNORE';
local $SIG{HUP} = 'IGNORE';
local $SIG{INT} = 'IGNORE';
@@
-228,7
+226,8
@@
Services can be new, in which case they are inserted, or existing unaudited
services, in which case they are linked to the newly-created package.
Currently available options are: I<depend_jobnum>, I<noexport>, I<seconds_ref>,
services, in which case they are linked to the newly-created package.
Currently available options are: I<depend_jobnum>, I<noexport>, I<seconds_ref>,
-I<upbytes_ref>, I<downbytes_ref>, and I<totalbytes_ref>.
+I<upbytes_ref>, I<downbytes_ref>, I<totalbytes_ref>, I<allow_pkgpart>, and
+I<import>.
If I<depend_jobnum> is set, all provisioning jobs will have a dependancy
on the supplied jobnum (they will not run until the specific job completes).
If I<depend_jobnum> is set, all provisioning jobs will have a dependancy
on the supplied jobnum (they will not run until the specific job completes).
@@
-245,6
+244,8
@@
If I<seconds_ref>, I<upbytes_ref>, I<downbytes_ref>, or I<totalbytes_ref> is
provided, the scalars (provided by references) will be incremented by the
values of the prepaid card.`
provided, the scalars (provided by references) will be incremented by the
values of the prepaid card.`
+I<allow_pkgpart> and I<import> are flags passed to L<FS::cust_pkg>->insert.
+
=cut
sub order_pkgs {
=cut
sub order_pkgs {
@@
-277,7
+278,7
@@
sub order_pkgs {
'cust_pkg' => $cust_pkg,
'svcs' => $cust_pkgs->{$cust_pkg},
map { $_ => $options{$_} }
'cust_pkg' => $cust_pkg,
'svcs' => $cust_pkgs->{$cust_pkg},
map { $_ => $options{$_} }
- qw( seconds_ref upbytes_ref downbytes_ref totalbytes_ref depend_jobnum )
+ qw( seconds_ref upbytes_ref downbytes_ref totalbytes_ref depend_jobnum
allow_pkgpart import
)
);
if ( $error ) {
$dbh->rollback if $oldAutoCommit;
);
if ( $error ) {
$dbh->rollback if $oldAutoCommit;