X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Fcommunigate_pro.pm;h=42f562c2b2101b1da73227efde9fbf55823bef70;hb=af822b448b22bc49c1f149a54ba90f643faddaf8;hp=07281f1403fccf0c6a3614e545c1d66af37738fa;hpb=99c7d450aa6246fcd79cd1a536a688bc70ac4fc9;p=freeside.git

diff --git a/FS/FS/part_export/communigate_pro.pm b/FS/FS/part_export/communigate_pro.pm
index 07281f140..42f562c2b 100644
--- a/FS/FS/part_export/communigate_pro.pm
+++ b/FS/FS/part_export/communigate_pro.pm
@@ -135,6 +135,15 @@ sub _export_insert_svc_acct {
       if $alias_err;
   }
 
+  my $rule_error = $self->communigate_pro_queue(
+    $svc_acct->svcnum,
+    'SetAccountMailRules',
+    $self->export_username($svc_acct),
+    $svc_acct->cgp_rule_arrayref,
+  );
+  warn "WARNING: error queueing SetAccountMailRules job: $rule_error"
+    if $rule_error;
+
   '';
 
 }
@@ -204,6 +213,15 @@ sub _export_insert_svc_domain {
   warn "WARNING: error queueing SetAccountDefaultPrefs job: $pref_err"
     if $pref_err;
 
+  my $rule_error = $self->communigate_pro_queue(
+    $svc_domain->svcnum,
+    'SetDomainMailRules',
+    $svc_domain->domain,
+    $svc_domain->cgp_rule_arrayref,
+  );
+  warn "WARNING: error queueing SetDomainMailRules job: $rule_error"
+    if $rule_error;
+
   '';
 
 }
@@ -349,6 +367,15 @@ sub _export_replace_svc_acct {
     return $error if $error;
   }
 
+  my $rule_error = $self->communigate_pro_queue(
+    $new->svcnum,
+    'SetAccountMailRules',
+    $self->export_username($new),
+    $new->cgp_rule_arrayref,
+  );
+  warn "WARNING: error queueing SetAccountMailRules job: $rule_error"
+    if $rule_error;
+
   '';
 
 }
@@ -356,12 +383,16 @@ sub _export_replace_svc_acct {
 sub _export_replace_svc_domain {
   my( $self, $new, $old ) = (shift, shift, shift);
 
+  #let's just do the rename part realtime rather than trying to queue
+  #w/dependencies.  we don't want FS winding up out-of-sync with the wrong
+  #username and a queued job anyway.  right??
   if ( $old->domain ne $new->domain ) {
-    my $error = $self->communigate_pro_queue( $new->svcnum, 'RenameDomain',
-      $old->domain, $new->domain,
-    );
-    return $error if $error;
+    eval { $self->communigate_pro_runcommand(
+             'RenameDomain', $old->domain, $new->domain,
+         ) };
+    return $@ if $@;
   }
+
   my %settings = ();
   $settings{'AccountsLimit'} = $new->max_accounts
     if $old->max_accounts ne $new->max_accounts;
@@ -429,6 +460,15 @@ sub _export_replace_svc_domain {
   warn "WARNING: error queueing SetAccountDefaultPrefs job: $pref_err"
     if $pref_err;
 
+  my $rule_error = $self->communigate_pro_queue(
+    $new->svcnum,
+    'SetDomainMailRules',
+    $new->domain,
+    $new->cgp_rule_arrayref,
+  );
+  warn "WARNING: error queueing SetDomainMailRules job: $rule_error"
+    if $rule_error;
+
   '';
 }
 
@@ -655,24 +695,11 @@ sub export_getsettings_svc_domain {
   ) };
   return $@ if $@;
 
-  %$effective_settings = (
-    %$effective_settings,
-    ( map { ("Acct. Default $_" => $acct_defaults->{$_}); }
-          keys(%$acct_defaults)
-    ),
-    ( map { ("Acct. Default $_" => $acct_defaultprefs->{$_}); } #diff label??
-          keys(%$acct_defaultprefs)
-    ),
-  );
-  %$settings = (
-    %$settings,
-    ( map { ("Acct. Default $_" => $acct_defaults->{$_}); }
-          keys(%$acct_defaults)
-    ),
-    ( map { ("Acct. Default $_" => $acct_defaultprefs->{$_}); } #diff label??
-          keys(%$acct_defaultprefs)
-    ),
-  );
+  my $rules = eval { $self->communigate_pro_runcommand(
+    'GetDomainMailRules',
+    $svc_domain->domain
+  ) };
+  return $@ if $@;
 
   #aliases too
   my $aliases = eval { $self->communigate_pro_runcommand(
@@ -681,9 +708,19 @@ sub export_getsettings_svc_domain {
   ) };
   return $@ if $@;
 
-  $effective_settings->{'Aliases'} = join(', ', @$aliases);
-  $settings->{'Aliases'}           = join(', ', @$aliases);
+  my %more = (
+    ( map { ("Acct. Default $_" => $acct_defaults->{$_}); }
+          keys(%$acct_defaults)
+    ),
+    ( map { ("Acct. Default $_" => $acct_defaultprefs->{$_}); } #diff label??
+          keys(%$acct_defaultprefs)
+    ),
+    ( map _rule2string($_), @$rules ),
+    'Aliases' => join(', ', @$aliases),
+  );
 
+  %$effective_settings = ( %$effective_settings, %more );
+  %$settings = ( %$settings, %more );
 
   #false laziness w/below
   
@@ -750,8 +787,21 @@ sub export_getsettings_svc_acct {
                      keys(%$prefs)
                );
 
-  #aliases too
+  #mail rules
+  my $rules = eval { $self->communigate_pro_runcommand(
+    'GetAccountMailRules',
+    $svc_acct->email
+  ) };
+  return $@ if $@;
+
+  %$effective_settings = ( %$effective_settings,
+                           map _rule2string($_), @$rules
+                         );
+  %$settings = ( %$settings,
+                 map _rule2string($_), @$rules
+               );
 
+  #aliases too
   my $aliases = eval { $self->communigate_pro_runcommand(
     'GetAccountAliases',
     $svc_acct->email
@@ -785,6 +835,14 @@ sub export_getsettings_svc_acct {
 
 }
 
+sub _rule2string {
+  my $rule = shift;
+  my($priority, $name, $conditions, $actions, $comment) = @$rule;
+  $conditions = join(', ', map { my $a = $_; join(' ', @$a); } @$conditions);
+  $actions    = join(', ', map { my $a = $_; join(' ', @$a); } @$actions);
+  ("Mail rule $name" => "$priority IF $conditions THEN $actions ($comment)");
+}
+
 sub export_getsettings_svc_mailinglist {
   my($self, $svc_mailinglist, $settingsref, $defaultref ) = @_;