[freeside-commits] branch master updated. 7dd026a106a667317a64568708a727c6e5bec55a

Ivan ivan at 420.am
Sat Jan 11 22:53:50 PST 2014


The branch, master has been updated
       via  7dd026a106a667317a64568708a727c6e5bec55a (commit)
      from  0ddb95ef7e09ada82657f30ce459fe229b2851c0 (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 7dd026a106a667317a64568708a727c6e5bec55a
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Jan 11 22:53:46 2014 -0800

    indosoft integration, RT#25555

diff --git a/FS/FS/part_export/indosoft_pbx.pm b/FS/FS/part_export/indosoft_pbx.pm
new file mode 100644
index 0000000..23ad67a
--- /dev/null
+++ b/FS/FS/part_export/indosoft_pbx.pm
@@ -0,0 +1,210 @@
+package FS::part_export::indosoft_pbx;
+use base qw( FS::part_export );
+
+use vars qw( %info );
+use Tie::IxHash;
+use Lingua::EN::NameParse;
+
+tie my %options, 'Tie::IxHash',
+   'host'        => { label => 'Q-Suite API hostname' },
+   'gateway_key' => { label => 'API gateway key' },
+;
+
+%info = (
+  'svc'      => [qw( svc_pbx svc_phone svc_acct )],
+  'desc'     =>
+    'Export PBX tenants and DIDs to Indosoft Q-Suite',
+  'options'  => \%options,
+  'no_machine' => 1,
+  'notes'    => <<'END'
+Export PBX tenants and DIDs to Indosoft Q-Suite.
+Net::Indosoft::QSuite is required.
+END
+);
+
+$insert_hack = 0;
+
+sub rebless { shift; }
+
+sub _export_insert {
+  my($self, $svc_x) = (shift, shift);
+
+  my $cust_main = $svc_x->cust_svc->cust_pkg->cust_main;
+
+  if ( $svc_x->isa('FS::svc_pbx') ) {
+
+    my $uuid = $self->indosoft_runcommand( 'editTenant',
+      'mode'          => 'create',
+      'name'          => $svc_x->title || $cust_main->name,
+      'shortname'     => $svc_x->svcnum, #?
+      #'hostname'      => #XXX what goes here?  add to svc_pbx?
+      'callerid_name' => $svc_x->title || $cust_main->name, #separate?  add to svc_pbx?
+      #'callerid_number' => #XXX where tf to get this from?  svc_pbx again?
+    );
+
+    $svc_x->id( $uuid );
+
+    # ?
+    #my $unneeded_trunk_uuid = $self->indosoft_command( 'assignTrunkToTenant,
+    #  'tenant_uuid' => $uuid,
+    #  'trunk_id'    => $self->option('trunk_id'),
+    #);
+
+  } elsif ( $svc_x->isa('FS::svc_phone') ) {
+
+    my $same_number = $self->indosoft_runcommand( 'editDID',
+      'mode'        => 'create',
+      'tenant_uuid' => $svc_x->svc_pbx->id,
+      'number'      => $svc_x->phonenum,
+      # 'auto_attendant_uuid' =>#XXX where to get this from? svc_phone.newfield?
+    );
+
+    #set the auto-attendant name, repeate limit, response limit, extension dialing?
+
+    #XXX ring group?
+
+  } elsif ( $svc_x->isa('FS::svc_acct') ) {
+
+    my($firstname, $lastname);
+    my $NameParse = new Lingua::EN::NameParse;
+    if ( $NameParse->parse( $svc_x->finger ) ) {
+      $firstname = $cust_main->first,
+      $lastname  = $cust_main->get('last'),
+    } else {
+      my %name = $NameParse->components;
+      $firstname = $name{given_name_1} || $name{initials_1}; #wtf NameParse, Ed?
+      $lastname  = $name{surname_1};
+    }
+
+    my $uuid = $self->indosoft_command( 'editEmployee',
+      'mode'        => 'create'
+      'tenant_uuid' => $svc_x->svc_pbx->id,
+      'username'    => $svc_x->username,
+      'password'    => $svc_x->_password,
+      'firstname'   => $firstname,
+      'lastname'    => $firstname,
+    );
+
+  #XXX extensions (pbx_extension export?  look at how svc_phone does its device export stuff
+
+  #XXX devices (links employee to extension (svc_acct to pbx_extension)?  how's that?  seems like they _go_ with extensions.  where to pick user?
+
+  #XXX voicemail pin?
+  #XXX extension forwarding?
+
+  } else {
+    die "guru meditation #five five five five: $svc_x is not FS::svc_pbx, FS::svc_phone or FS::svc_acct";
+  }
+
+  local($insert_hack) = 1;
+  #my $error = $svc_phone->replace;
+  #return $error if $error;
+  $svc_x->replace;
+
+}
+
+sub _export_replace {
+  my( $self, $new, $old ) = (shift, shift, shift);
+
+  return '' if $insert_hack;
+
+  #change anything?
+}
+
+sub _export_delete {
+  my( $self, $svc_phone ) = (shift, shift);
+
+  #delete conference
+
+  '';
+
+}
+
+# #these three are optional
+# # fallback for svc_acct will change and restore password
+# sub _export_suspend {
+#   my( $self, $svc_phone ) = (shift, shift);
+#   $err_or_queue = $self->indosoft_queue( $svc_phone->svcnum,
+#     'suspend', $svc_phone->username );
+#   ref($err_or_queue) ? '' : $err_or_queue;
+# }
+# 
+# sub _export_unsuspend {
+#   my( $self, $svc_phone ) = (shift, shift);
+#   $err_or_queue = $self->indosoft_queue( $svc_phone->svcnum,
+#     'unsuspend', $svc_phone->username );
+#   ref($err_or_queue) ? '' : $err_or_queue;
+# }
+# 
+# sub export_links {
+#   my($self, $svc_phone, $arrayref) = (shift, shift, shift);
+#   #push @$arrayref, qq!<A HREF="http://example.com/~!. $svc_phone->username.
+#   #                 qq!">!. $svc_phone->username. qq!</A>!;
+#   '';
+# }
+
+###
+
+sub indosoft_runcommand {
+  my( $self, $method ) = (shift, shift);
+
+  indosoft_command(
+    $self->option('host'),
+    $self->option('gateway_key'),
+    $method,
+    @_,
+  );
+
+}
+
+sub indosoft_command {
+  my( $host, $gateway_key, $method, @args ) = @_;
+
+  eval 'use Net::Indosoft::Qsuite;';
+  die $@ if $@;
+
+  my $qsuite = new Net::Indosoft::Qsuite( 'host'        => $host,
+                                          'gateway_key' => $gateway_key,
+                                        );
+
+  my $return = $qsuite->$method( @args );
+
+  die "Indosoft error: ". $qsuite->errstr if $qsuite->errstr;
+
+  $return;
+
+}
+
+
+# #a good idea to queue anything that could fail or take any time
+# sub indosoft_queue {
+#   my( $self, $svcnum, $method ) = (shift, shift, shift);
+#   my $queue = new FS::queue {
+#     'svcnum' => $svcnum,
+#     'job'    => "FS::part_export::indosoft::indosoft_$method",
+#   };
+#   $queue->insert( @_ ) or $queue;
+# }
+# 
+# sub indosoft_insert { #subroutine, not method
+#   my( $username, $password ) = @_;
+#   #do things with $username and $password
+# }
+# 
+# sub indosoft_replace { #subroutine, not method
+# }
+# 
+# sub indosoft_delete { #subroutine, not method
+#   my( $username ) = @_;
+#   #do things with $username
+# }
+# 
+# sub indosoft_suspend { #subroutine, not method
+# }
+# 
+# sub indosoft_unsuspend { #subroutine, not method
+# }
+
+
+1;
+
diff --git a/FS/FS/svc_PBX_Mixin.pm b/FS/FS/svc_PBX_Mixin.pm
new file mode 100644
index 0000000..41aabd0
--- /dev/null
+++ b/FS/FS/svc_PBX_Mixin.pm
@@ -0,0 +1,52 @@
+package FS::svc_PBX_Mixin;
+
+use strict;
+use FS::Record qw( qsearchs ); # qw(qsearch qsearchs);
+use FS::svc_pbx;
+
+=head1 NAME
+
+FS::svc_PBX_Mixin - Mixin class for svc_classes with a pbxsvc field
+
+=head1 SYNOPSIS
+
+package FS::svc_table;
+use base qw( FS::svc_PBX_Mixin FS::svc_Common );
+
+=head1 DESCRIPTION
+
+This is a mixin class for svc_ classes that contain a pbxsvc field linking to
+a PBX (see L<FS::svc_pbx>).
+
+=head1 METHODS
+
+=over 4
+
+=item svc_pbx
+
+Returns the FS::svc_pbx record for this account's domain (see
+L<FS::svc_pbx>).
+
+=cut
+
+# FS::h_svc_acct has a history-aware svc_domain override
+
+sub svc_pbx {
+  my $self = shift;
+  #$self->{'_pbxsvc'}
+  #  ? $self->{'_pbxsvc'}
+  #  :
+      qsearchs( 'svc_pbx', { 'svcnum' => $self->pbxsvc } );
+}
+
+=back
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::svc_Common>, L<FS::Record>
+
+=cut
+
+1;
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 3ca40a3..c5c5f35 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -1,11 +1,11 @@
 package FS::svc_acct;
-use base qw( FS::svc_Domain_Mixin
-             FS::svc_CGP_Mixin
-             FS::svc_CGPRule_Mixin
+use base qw( FS::svc_Domain_Mixin FS::svc_PBX_Mixin
+             FS::svc_CGP_Mixin FS::svc_CGPRule_Mixin
              FS::svc_Radius_Mixin
              FS::svc_Tower_Mixin
              FS::svc_IP_Mixin
-             FS::svc_Common );
+             FS::svc_Common
+           );
 
 use strict;
 use vars qw( $DEBUG $me $conf $skip_fuzzyfiles
diff --git a/FS/FS/svc_phone.pm b/FS/FS/svc_phone.pm
index 36d57a5..73bb772 100644
--- a/FS/FS/svc_phone.pm
+++ b/FS/FS/svc_phone.pm
@@ -1,5 +1,8 @@
 package FS::svc_phone;
-use base qw( FS::svc_Domain_Mixin FS::location_Mixin FS::svc_Common );
+use base qw( FS::svc_Domain_Mixin FS::svc_PBX_Mixin 
+             FS::location_Mixin
+             FS::svc_Common
+           );
 
 use strict;
 use vars qw( $DEBUG $me @pw_set $conf $phone_name_max

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

Summary of changes:
 FS/FS/part_export/indosoft_pbx.pm |  210 +++++++++++++++++++++++++++++++++++++
 FS/FS/svc_PBX_Mixin.pm            |   52 +++++++++
 FS/FS/svc_acct.pm                 |    8 +-
 FS/FS/svc_phone.pm                |    5 +-
 4 files changed, 270 insertions(+), 5 deletions(-)
 create mode 100644 FS/FS/part_export/indosoft_pbx.pm
 create mode 100644 FS/FS/svc_PBX_Mixin.pm




More information about the freeside-commits mailing list