X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Finfostreet.pm;h=caca7c5e13fbc32ca2e3e42c22c0a113f300d817;hb=70997699eb64ce36ca408214cfe4dbc502d7ca58;hp=8a68a2077e5aeaccba95470407feb31f31e81143;hpb=29bb6991a3b7187784cd14a3806b0c9db38dd51b;p=freeside.git

diff --git a/FS/FS/part_export/infostreet.pm b/FS/FS/part_export/infostreet.pm
index 8a68a2077..caca7c5e1 100644
--- a/FS/FS/part_export/infostreet.pm
+++ b/FS/FS/part_export/infostreet.pm
@@ -1,11 +1,13 @@
 package FS::part_export::infostreet;
 
-use vars qw(@ISA %infostreet2cust_main);
+use vars qw(@ISA %infostreet2cust_main $DEBUG);
 use FS::UID qw(dbh);
 use FS::part_export;
 
 @ISA = qw(FS::part_export);
 
+$DEBUG = 0;
+
 %infostreet2cust_main = (
   'firstName'   => 'first',
   'lastName'    => 'last',
@@ -48,11 +50,17 @@ sub _export_insert {
   $contact_info{'email'} = $emails[0] if @emails;
 
   #this one is kinda noment-specific
-  $contact_info{'title'} = $cust_main->agent->agent;
+  $contact_info{'organization'} = $cust_main->agent->agent;
 
   $err_or_queue = $self->infostreet_queueContact( $svc_acct->svcnum,
     $svc_acct->username, %contact_info );
   return $err_or_queue unless ref($err_or_queue);
+
+  # If a quota has been specified set the quota because it is not the default
+  $err_or_queue = $self->infostreet_queueSetQuota( $svc_acct->svcnum, 
+    $svc_acct->username, $svc_acct->quota ) if $svc_acct->quota;
+  return $err_or_queue unless ref($err_or_queue);
+
   my $error = $err_or_queue->depend_insert( $jobnum );
   return $error if $error;
 
@@ -66,6 +74,13 @@ sub _export_replace {
   my( $self, $new, $old ) = (shift, shift, shift);
   return "can't change username with InfoStreet"
     if $old->username ne $new->username;
+
+  # If the quota has changed then do the export to setQuota
+  my $err_or_queue = $self->infostreet_queueSetQuota( $new->svcnum, $new->username, $new->quota ) 
+        if ( $old->quota != $new->quota );  
+  return $err_or_queue unless ref($err_or_queue);
+
+
   return '' unless $old->_password ne $new->_password;
   $self->infostreet_queue( $new->svcnum,
     'passwd', $new->username, $new->_password );
@@ -141,16 +156,42 @@ sub infostreet_setContact {
   my($url, $is_username, $is_password, $groupID, $username, %contact_info) = @_;
   my $accountID = infostreet_command($url, $is_username, $is_password, $groupID,
     'getAccountID', $username);
-  foreach my $field ( %contact_info ) {
+  foreach my $field ( keys %contact_info ) {
     infostreet_command($url, $is_username, $is_password, $groupID,
-      'setContactField', $field, $contact_info{$field} );
+      'setContactField', [ 'int'=>$accountID ], $field, $contact_info{$field} );
   }
 
 }
 
+sub infostreet_queueSetQuota {
+
+ my( $self, $svcnum) = (shift, shift);
+ my $queue = new FS::queue {
+    'svcnum' => $svcnum,
+    'job'    => 'FS::part_export::infostreet::infostreet_setQuota',
+ };
+
+ $queue->insert(
+    $self->option('url'),
+    $self->option('login'),
+    $self->option('password'),
+    $self->option('groupID'),
+    @_,
+ ) or $queue;
+
+}
+
+sub infostreet_setQuota {
+  my($url, $is_username, $is_password, $groupID, $username, $quota) = @_;
+  infostreet_command($url, $is_username, $is_password, $groupID, 'setQuota', $username, [ 'int'=> $quota ]  );
+}
+
+
 sub infostreet_command { #subroutine, not method
   my($url, $username, $password, $groupID, $method, @args) = @_;
 
+  warn "[FS::part_export::infostreet] $method ".join(' ', @args)."\n" if $DEBUG;
+
   #quelle hack
   if ( $method =~ /,/ ) {
     foreach my $part ( split(/,\s*/, $method) ) {
@@ -160,6 +201,15 @@ sub infostreet_command { #subroutine, not method
   }
 
   eval "use Frontier::Client;";
+  die $@ if $@;
+
+  eval 'sub Frontier::RPC2::String::repr {
+    my $self = shift;
+    my $value = $$self;
+    $value =~ s/([&<>\"])/$Frontier::RPC2::char_entities{$1}/ge;
+    $value;
+  }';
+  die $@ if $@;
 
   my $conn = Frontier::Client->new( url => $url );
   my $key_result = $conn->call( 'authenticate', $username, $password, $groupID);
@@ -168,7 +218,15 @@ sub infostreet_command { #subroutine, not method
   my $key = $key_result{data};
 
   #my $result = $conn->call($method, $key, @args);
-  my $result = $conn->call($method, $key, map { $conn->string($_) } @args);
+  my $result = $conn->call( $method, $key,
+                            map {
+                                  if ( ref($_) ) {
+                                    my( $type, $value) = @{$_};
+                                    $conn->$type($value);
+                                  } else {
+                                    $conn->string($_);
+                                  }
+                                } @args );
   my %result = _infostreet_parse($result);
   die $result{error} unless $result{success};