[freeside-commits] branch master updated. 6da8d320d8792e6b70ec5cf1a40088f87f4762e5
Ivan
ivan at 420.am
Wed Feb 11 20:24:57 PST 2015
The branch, master has been updated
via 6da8d320d8792e6b70ec5cf1a40088f87f4762e5 (commit)
via dcc681be581db6779de6cf71f94ad2ea28614bed (commit)
via c463da07ef97b754c7fcba0b154517e0b004f797 (commit)
from a98ce69c291c99710fc77a1b06286f44584e1f99 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6da8d320d8792e6b70ec5cf1a40088f87f4762e5
Merge: dcc681b a98ce69
Author: Ivan Kohler <ivan at freeside.biz>
Date: Wed Feb 11 20:24:53 2015 -0800
Merge branch 'master' of git.freeside.biz:/home/git/freeside
commit dcc681be581db6779de6cf71f94ad2ea28614bed
Author: Ivan Kohler <ivan at freeside.biz>
Date: Wed Feb 11 20:24:50 2015 -0800
add quantity and location to self-service package order API, RT#33219
diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 86c7ac3..a0546fc 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -47,6 +47,7 @@ use FS::acct_rt_transaction;
use FS::msg_template;
use FS::contact;
use FS::cust_contact;
+use FS::cust_location;
$DEBUG = 1;
$me = '[FS::ClientAPI::MyAccount]';
@@ -2302,11 +2303,23 @@ sub order_pkg {
or return { 'error' => "unknown custnum $custnum" };
my $status = $cust_main->status;
+
+ my %order_pkg_options = ();
+ if ( $p->{locationnum} > 0 ) {
+ $order_pkg_options{locationnum} = delete($p->{locationnum});
+ } elsif ( $p->{address1} ) {
+ $order_pkg_options{'cust_location'} = new FS::cust_location {
+ map { $_ => $p->{$_} }
+ qw( address1 address2 city county state zip country )
+ };
+ }
+
#false laziness w/ClientAPI/Signup.pm
my $cust_pkg = new FS::cust_pkg ( {
- 'custnum' => $custnum,
- 'pkgpart' => $p->{'pkgpart'},
+ 'custnum' => $custnum,
+ 'pkgpart' => $p->{'pkgpart'},
+ 'quantity' => $p->{'quantity'} || 1,
} );
my $error = $cust_pkg->check;
return { 'error' => $error } if $error;
@@ -2365,11 +2378,12 @@ sub order_pkg {
}
- use Tie::RefHash;
- tie my %hash, 'Tie::RefHash';
- %hash = ( $cust_pkg => \@svc );
- #msgcat
- $error = $cust_main->order_pkgs( \%hash, 'noexport' => 1 );
+ $error = $cust_main->order_pkg(
+ 'cust_pkg' => $cust_pkg,
+ 'svcs' => \@svc,
+ 'noexport' => 1,
+ %order_pkg_options,
+ );
return { 'error' => $error } if $error;
my $conf = new FS::Conf;
diff --git a/FS/FS/cust_main/Packages.pm b/FS/FS/cust_main/Packages.pm
index 9899bd0..d7a1e92 100644
--- a/FS/FS/cust_main/Packages.pm
+++ b/FS/FS/cust_main/Packages.pm
@@ -57,6 +57,15 @@ jobs will have a dependancy on the supplied job (they will not run until the
specific job completes). This can be used to defer provisioning until some
action completes (such as running the customer's credit card successfully).
+=item noexport
+
+This option is option is deprecated but still works for now (use
+I<depend_jobnum> instead for new code). If I<noexport> is set true, no
+provisioning jobs (exports) are scheduled. (You can schedule them later with
+the B<reexport> method for each cust_pkg object. Using the B<reexport> method
+on the cust_main object is not recommended, as existing services will also be
+reexported.)
+
=item ticket_subject
Optional subject for a ticket created and attached to this customer
@@ -79,6 +88,8 @@ sub order_pkg {
join(', ', map { "$_: $opt->{$_}" } keys %$opt ). "\n"
if $DEBUG;
+ local $FS::svc_Common::noexport_hack = 1 if $opt->{'noexport'};
+
my $cust_pkg = $opt->{'cust_pkg'};
my $svcs = $opt->{'svcs'} || [];
@@ -182,18 +193,14 @@ sub order_pkg {
'custnum' => $self->custnum,
'main_pkgnum' => $cust_pkg->pkgnum,
# try to prevent as many surprises as possible
- 'pkgbatch' => $cust_pkg->pkgbatch,
- 'start_date' => $cust_pkg->start_date,
- 'order_date' => $cust_pkg->order_date,
- 'expire' => $cust_pkg->expire,
- 'adjourn' => $cust_pkg->adjourn,
- 'contract_end' => $cust_pkg->contract_end,
- 'refnum' => $cust_pkg->refnum,
- 'discountnum' => $cust_pkg->discountnum,
- 'waive_setup' => $cust_pkg->waive_setup,
'allow_pkgpart' => $opt->{'allow_pkgpart'},
+ map { $_ => $cust_pkg->$_() }
+ qw( pkgbatch
+ start_date order_date expire adjourn contract_end
+ refnum discountnum waive_setup
+ )
});
- $error = $self->order_pkg('cust_pkg' => $pkg,
+ $error = $self->order_pkg('cust_pkg' => $pkg,
'locationnum' => $cust_pkg->locationnum);
if ( $error ) {
$dbh->rollback if $oldAutoCommit;
@@ -233,7 +240,8 @@ on the supplied jobnum (they will not run until the specific job completes).
This can be used to defer provisioning until some action completes (such
as running the customer's credit card successfully).
-The I<noexport> option is deprecated. If I<noexport> is set true, no
+The I<noexport> option is deprecated but still works for now (use
+I<depend_jobnum> instead for new code). If I<noexport> is set true, no
provisioning jobs (exports) are scheduled. (You can schedule them later with
the B<reexport> method for each cust_pkg object. Using the B<reexport> method
on the cust_main object is not recommended, as existing services will also be
diff --git a/fs_selfservice/FS-SelfService/SelfService.pm b/fs_selfservice/FS-SelfService/SelfService.pm
index 3aa60a0..0f78080 100644
--- a/fs_selfservice/FS-SelfService/SelfService.pm
+++ b/fs_selfservice/FS-SelfService/SelfService.pm
@@ -834,6 +834,25 @@ Session identifier
Package to order (see L<FS::part_pkg>).
+=item quantity
+
+Quantity for this package order (default 1).
+
+=item locationnum
+
+Optional locationnum for this package order, for existing locations.
+
+Or, for new locations, pass the following fields: address1*, address2, city*,
+county, state*, zip*, country. (* = required in this case)
+
+=item address1
+
+=item address 2
+
+=item city
+
+=item
+
=item svcpart
Service to order (see L<FS::part_svc>).
commit c463da07ef97b754c7fcba0b154517e0b004f797
Author: Ivan Kohler <ivan at freeside.biz>
Date: Wed Feb 11 18:20:14 2015 -0800
remove vestigial code for ancient multi-db/mapsecrets operation
diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index 9c52f08..f41735d 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -74,7 +74,6 @@ sub adminsuidsetup {
sub forksuidsetup {
my $user = shift;
- my $olduser = $user;
warn "$me forksuidsetup starting for $user\n" if $DEBUG;
if ( $FS::CurrentUser::upgrade_hack ) {
@@ -88,7 +87,7 @@ sub forksuidsetup {
env_setup();
- db_setup($olduser);
+ db_setup();
callback_setup();
@@ -118,16 +117,11 @@ sub env_setup {
}
sub db_setup {
- my $olduser = shift;
-
croak "Not running uid freeside (\$>=$>, \$<=$<)\n" unless checkeuid();
warn "$me forksuidsetup connecting to database\n" if $DEBUG;
- if ( $FS::CurrentUser::upgrade_hack && $olduser ) {
- $dbh = &myconnect($olduser);
- } else {
- $dbh = &myconnect();
- }
+ $dbh = &myconnect();
+
warn "$me forksuidsetup connected to database with handle $dbh\n" if $DEBUG;
warn "$me forksuidsetup loading schema\n" if $DEBUG;
-----------------------------------------------------------------------
Summary of changes:
FS/FS/ClientAPI/MyAccount.pm | 28 ++++++++++++++++++------
FS/FS/UID.pm | 12 +++--------
FS/FS/cust_main/Packages.pm | 30 ++++++++++++++++----------
fs_selfservice/FS-SelfService/SelfService.pm | 19 ++++++++++++++++
4 files changed, 62 insertions(+), 27 deletions(-)
More information about the freeside-commits
mailing list