refs #39633, fixes sync error message

NETivism · Jun 7, 2024 · 3ea85a8 · 3ea85a8
1 parent 4e662fd
commit 3ea85a8
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/CRM/Mailing/External/SmartMarketing.php b/CRM/Mailing/External/SmartMarketing.php
@@ -93,9 +93,25 @@ public static function syncGroup($groupId) {
             );
           }
         }
+        else {
+          return array(
+            'batch' => FALSE,
+            'batch_id' => 0,
+            'result' => array(
+              '#report' => array('error' => ts('Please provide at least 1 contact.')),
+            ),
+          );
+        }
       }
     }
-    return array();
+
+    return array(
+      'batch' => FALSE,
+      'batch_id' => 0,
+      'result' => array(
+        '#report' => array('error' => ts('The group you request doesn\'t exists in flydove.')),
+      ),
+    );
   }
 
   public static function getProviderByGroup($groupId) {

diff --git a/CRM/Mailing/Page/AJAX.php b/CRM/Mailing/Page/AJAX.php
@@ -83,7 +83,7 @@ public static function addContactToRemote() {
           'message' => '<p>'.ts('Because of the large amount of data you are about to perform, we have scheduled this job for the batch process. You will receive an email notification when the work is completed.'). '</p><p>&raquo; <a href="'.CRM_Utils_System::url('civicrm/admin/batch', "reset=1&id={$syncResult['batch_id']}").'" target="_blank">'.ts('Batch Job List').'</a></p>',
         );
       }
-      elseif (!empty($syncResult['result']['#report'])) {
+      elseif (!empty($syncResult['result']['#count']) && !empty($syncResult['result']['#report'])) {
         $report = ts('Successful synced');
         foreach($syncResult['result']['#report'] as $rep) {
           $report .= "<p>$rep</p>";
@@ -94,9 +94,13 @@ public static function addContactToRemote() {
         );
       }
       else {
+        $report = ts('Synchronize error').': ';
+        foreach($syncResult['result']['#report'] as $rep) {
+          $report .= "<span>$rep</span>";
+        }
         $remoteResult = array(
           'success' => FALSE,
-          'message' => ts('Synchronize error').':'.$syncResult,
+          'message' => $report,
         );
       }
     }