[freeside-commits] branch FREESIDE_3_BRANCH updated. f888466b118f5f433cc123d455e611291f596466

[Ivan]

The branch, FREESIDE_3_BRANCH has been updated
       via  f888466b118f5f433cc123d455e611291f596466 (commit)
       via  0c76afbb717e1716e6126bc4a120b8d9471614a0 (commit)
       via  7beec7068e00be5ae1b2599fdf2b494bc19e31d0 (commit)
       via  9e8d2a5bafb21c42f54cdd9b3703e2f88a36e0a8 (commit)
      from  3e2c2ad8aff1bd361ca07495b2255538c8231079 (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 f888466b118f5f433cc123d455e611291f596466
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Aug 7 23:18:31 2015 -0700

    this can't possibly make a difference - context?  RT#33681

diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index b402ed3..61d2975 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -1244,7 +1244,7 @@ sub process_batch_import {
     'format_types' => { 'simple' => '' }, #force infer from file extension
     'default_csv'  => 1, #if not .xls, will read as csv, regardless of extension
     'format_hash_callbacks' => { 'simple' => $hashcb },
-    'insert_args_callback'  => sub { ( 'manual'=>1 ) },
+    'insert_args_callback'  => sub { ( 'manual'=>1 ); },
     'postinsert_callback'   => sub {
       my $cust_pay = shift;
       my $cust_main = $cust_pay->cust_main

commit 0c76afbb717e1716e6126bc4a120b8d9471614a0
Merge: 7beec70 3e2c2ad
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Aug 7 22:01:31 2015 -0700

    Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE_3_BRANCH


commit 7beec7068e00be5ae1b2599fdf2b494bc19e31d0
Merge: 9e8d2a5 eb6536b
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Jun 13 15:18:37 2015 -0700

    Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE_3_BRANCH


commit 9e8d2a5bafb21c42f54cdd9b3703e2f88a36e0a8
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri May 15 12:22:50 2015 -0700

    add self-service provision_pbx, RT#34939

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index b4b60d4..d9378d8 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -2698,6 +2698,21 @@ sub provision_phone {
   { 'bulkdid' => [ @bulkdid ], 'svc' => $error->{'svc'} }
 }
 
+sub provision_pbx {
+  my $p = shift;
+  warn "provision_pbx called\n"
+    if $DEBUG;
+
+  warn "provision_pbx calling _provision\n"
+    if $DEBUG;
+  _provision( 'FS::svc_pbx',
+              [qw(id title max_extensions max_simultaneous ip_addr)],
+              [qw(id title max_extensions max_simultaneous ip_addr)],
+              $p,
+              @_
+            );
+}
+
 sub provision_acct {
   my $p = shift;
   warn "provision_acct called\n"
@@ -2763,6 +2778,9 @@ sub _provision {
   my $part_svc = qsearchs('part_svc', { 'svcpart' => $p->{'svcpart'} } )
     or return { 'error' => "unknown svcpart $p->{'svcpart'}" };
 
+  return { error=> 'svcpart '. $p->{'svcpart'}. " is not a $class definition" }
+    if $class ne 'FS::'. $part_svc->svcdb;
+
   warn "creating $class record\n"
     if $DEBUG;
   my $svc_x = $class->new( {
diff --git a/FS/FS/ClientAPI_XMLRPC.pm b/FS/FS/ClientAPI_XMLRPC.pm
index 7d97f3a..74d6854 100644
--- a/FS/FS/ClientAPI_XMLRPC.pm
+++ b/FS/FS/ClientAPI_XMLRPC.pm
@@ -155,6 +155,7 @@ sub ss2clientapi {
   'part_svc_info'             => 'MyAccount/part_svc_info',
   'provision_acct'            => 'MyAccount/provision_acct',
   'provision_phone'           => 'MyAccount/provision_phone',
+  'provision_pbx'             => 'MyAccount/provision_pbx',
   'provision_external'        => 'MyAccount/provision_external',
   'unprovision_svc'           => 'MyAccount/unprovision_svc',
   'myaccount_passwd'          => 'MyAccount/myaccount_passwd',
diff --git a/fs_selfservice/FS-SelfService/SelfService.pm b/fs_selfservice/FS-SelfService/SelfService.pm
index 7cc7c03..03a3f04 100644
--- a/fs_selfservice/FS-SelfService/SelfService.pm
+++ b/fs_selfservice/FS-SelfService/SelfService.pm
@@ -80,6 +80,7 @@ $socket .= '.'.$tag if defined $tag && length($tag);
   'part_svc_info'             => 'MyAccount/part_svc_info',
   'provision_acct'            => 'MyAccount/provision_acct',
   'provision_phone'           => 'MyAccount/provision_phone',
+  'provision_pbx'             => 'MyAccount/provision_pbx',
   'provision_external'        => 'MyAccount/provision_external',
   'unprovision_svc'           => 'MyAccount/unprovision_svc',
   'myaccount_passwd'          => 'MyAccount/myaccount_passwd',
@@ -1259,6 +1260,38 @@ E911 Address (optional)
 
 =back
 
+=item provision_pbx
+
+Provisions a customer PBX (svc_pbx).
+
+Takes a hash references as parameter with the following keys:
+
+=over 4
+
+=item session_id
+
+Session identifier
+
+=item pkgnum
+
+pkgnum of package into which this service is provisioned
+
+=item svcpart
+
+svcpart or service definition to provision
+
+=item id
+
+=item title
+
+=item max_extensions
+
+=item max_simultaneous
+
+=item ip_addr
+
+=back
+
 =item provision_external
 
 Provisions an external service (svc_external).

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/cust_pay.pm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)