diff --git a/CRM/Mailchimp/Form/Pull.php b/CRM/Mailchimp/Form/Pull.php index 05d4181..b892717 100644 --- a/CRM/Mailchimp/Form/Pull.php +++ b/CRM/Mailchimp/Form/Pull.php @@ -144,6 +144,7 @@ static function syncPullCollectMailchimp(CRM_Queue_TaskContext $ctx, $listID) { // Shared process. $count = CRM_Mailchimp_Form_Sync::syncCollectMailchimp($listID); + CRM_Mailchimp_Utils::checkDebug('CRM_Mailchimp_Form_Pull syncPullCollectMailchimp = $count', $count); static::updatePullStats(array( $listID => array('mc_count'=>$count))); return CRM_Queue_Task::TASK_SUCCESS; @@ -156,9 +157,11 @@ static function syncPullCollectCiviCRM(CRM_Queue_TaskContext $ctx, $listID) { // Shared process. $stats[$listID]['c_count'] = CRM_Mailchimp_Form_Sync::syncCollectCiviCRM($listID); + CRM_Mailchimp_Utils::checkDebug('CRM_Mailchimp_Form_Pull syncPullCollectCiviCRM $stats[$listID][c_count]', $stats[$listID]['c_count']); // Remove identicals $stats[$listID]['in_sync'] = CRM_Mailchimp_Form_Sync::syncIdentical(); + CRM_Mailchimp_Utils::checkDebug('CRM_Mailchimp_Form_Pull syncPullCollectCiviCRM $stats[$listID][in_sync]', $stats[$listID]['in_sync']); static::updatePullStats($stats); diff --git a/CRM/Mailchimp/Form/Sync.php b/CRM/Mailchimp/Form/Sync.php index bc89e29..2b6e527 100644 --- a/CRM/Mailchimp/Form/Sync.php +++ b/CRM/Mailchimp/Form/Sync.php @@ -73,7 +73,6 @@ public function postProcess() { } static function getRunner($skipEndUrl = FALSE) { - CRM_Mailchimp_Utils::checkDebug('Start-CRM_Mailchimp_Form_Sync getRunner $skipEndUrl= ', $skipEndUrl); // Setup the Queue $queue = CRM_Queue_Service::singleton()->create(array( 'name' => self::QUEUE_NAME, @@ -87,7 +86,7 @@ static function getRunner($skipEndUrl = FALSE) { // We need to process one list at a time. $groups = CRM_Mailchimp_Utils::getGroupsToSync(array(), null, $membership_only = TRUE); - CRM_Mailchimp_Utils::checkDebug('Middle-CRM_Mailchimp_Form_Sync getRunner $groups= ', $groups); + CRM_Mailchimp_Utils::checkDebug('CRM_Mailchimp_Form_Sync getRunner $groups= ', $groups); if (!$groups) { // Nothing to do. @@ -136,7 +135,6 @@ static function getRunner($skipEndUrl = FALSE) { static::updatePushStats($stats); CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Form_Sync getRunner $identifier= ', $identifier); - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Form_Sync getRunner $runner= ', $runner); return $runner; } @@ -145,9 +143,7 @@ static function getRunner($skipEndUrl = FALSE) { * Set up (sub)queue for syncing a Mailchimp List. */ static function syncPushList(CRM_Queue_TaskContext $ctx, $listID, $identifier) { - CRM_Mailchimp_Utils::checkDebug('Start-CRM_Mailchimp_Form_Sync syncPushList $ctx= ', $ctx); CRM_Mailchimp_Utils::checkDebug('Start-CRM_Mailchimp_Form_Sync syncPushList $listID= ', $listID); - CRM_Mailchimp_Utils::checkDebug('Start-CRM_Mailchimp_Form_Sync syncPushList $identifier= ', $identifier); // Split the work into parts: // @todo 'force' method not implemented here. @@ -179,9 +175,6 @@ static function syncPushList(CRM_Queue_TaskContext $ctx, $listID, $identifier) { "$identifier: Added new subscribers and updating existing data changes" )); - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Form_Sync syncPushList $ctx= ', $ctx); - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Form_Sync syncPushList $listID= ', $listID); - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Form_Sync syncPushList $identifier= ', $identifier); return CRM_Queue_Task::TASK_SUCCESS; } @@ -189,14 +182,12 @@ static function syncPushList(CRM_Queue_TaskContext $ctx, $listID, $identifier) { * Collect Mailchimp data into temporary working table. */ static function syncPushCollectMailchimp(CRM_Queue_TaskContext $ctx, $listID) { - CRM_Mailchimp_Utils::checkDebug('Start-CRM_Mailchimp_Form_Sync syncPushCollectMailchimp $ctx= ', $ctx); CRM_Mailchimp_Utils::checkDebug('Start-CRM_Mailchimp_Form_Sync syncPushCollectMailchimp $listID= ', $listID); $stats[$listID]['mc_count'] = static::syncCollectMailchimp($listID); + CRM_Mailchimp_Utils::checkDebug('Start-CRM_Mailchimp_Form_Sync syncPushCollectMailchimp $stats[$listID][mc_count]', $stats[$listID]['mc_count']); static::updatePushStats($stats); - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Form_Sync syncPushCollectMailchimp $ctx= ', $ctx); - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Form_Sync syncPushCollectMailchimp $listID= ', $listID); return CRM_Queue_Task::TASK_SUCCESS; } @@ -204,15 +195,13 @@ static function syncPushCollectMailchimp(CRM_Queue_TaskContext $ctx, $listID) { * Collect CiviCRM data into temporary working table. */ static function syncPushCollectCiviCRM(CRM_Queue_TaskContext $ctx, $listID) { - CRM_Mailchimp_Utils::checkDebug('Start-CRM_Mailchimp_Form_Sync syncPushCollectCiviCRM $ctx= ', $ctx); CRM_Mailchimp_Utils::checkDebug('Start-CRM_Mailchimp_Form_Sync syncPushCollectCiviCRM $listID= ', $listID); $stats[$listID]['c_count'] = static::syncCollectCiviCRM($listID); + CRM_Mailchimp_Utils::checkDebug('Start-CRM_Mailchimp_Form_Sync syncPushCollectCiviCRM $stats[$listID][c_count]= ', $stats[$listID]['c_count']); static::updatePushStats($stats); - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Form_Sync syncPushCollectCiviCRM $ctx= ', $ctx); - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Form_Sync syncPushCollectCiviCRM $listID= ', $listID); return CRM_Queue_Task::TASK_SUCCESS; } @@ -221,7 +210,6 @@ static function syncPushCollectCiviCRM(CRM_Queue_TaskContext $ctx, $listID) { */ static function syncPushRemove(CRM_Queue_TaskContext $ctx, $listID) { CRM_Mailchimp_Utils::checkDebug('Start-CRM_Mailchimp_Form_Sync syncPushRemove $listID= ', $listID); - CRM_Mailchimp_Utils::checkDebug('Start-CRM_Mailchimp_Form_Sync syncPushRemove $ctx= ', $ctx); // Delete records have the same hash - these do not need an update. static::updatePushStats(array($listID=>array('in_sync'=> static::syncIdentical()))); @@ -248,13 +236,12 @@ static function syncPushRemove(CRM_Queue_TaskContext $ctx, $listID) { } // Log the batch unsubscribe details - CRM_Core_Error::debug_var('Mailchimp batchUnsubscribe syncPushRemove $listID= ', $listID); CRM_Core_Error::debug_var('Mailchimp batchUnsubscribe syncPushRemove $batch= ', $batch); // Send Mailchimp Lists API Call: http://apidocs.mailchimp.com/api/2.0/lists/batch-unsubscribe.php $list = new Mailchimp_Lists(CRM_Mailchimp_Utils::mailchimp()); $result = $list->batchUnsubscribe( $listID, $batch, $delete=FALSE, $send_bye=FALSE, $send_notify=FALSE); - CRM_Mailchimp_Utils::checkDebug('CRM_Mailchimp_Form_Sync syncPushRemove $result= ', $result); + CRM_Mailchimp_Utils::checkDebug('CRM_Mailchimp_Form_Sync syncPushRemove $batchUnsubscriberesult= ', $result); // @todo check errors? $result['errors'] $result['success_count'] // Finally we can delete the emails that we just processed from the mailchimp temp table. @@ -265,9 +252,6 @@ static function syncPushRemove(CRM_Queue_TaskContext $ctx, $listID) { );"); static::updatePushStats($stats); - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Form_Sync syncPushRemove $listID= ', $listID); - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Form_Sync syncPushRemove $ctx= ', $ctx); - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Form_Sync syncPushRemove $result= ', $result); return CRM_Queue_Task::TASK_SUCCESS; } @@ -277,7 +261,6 @@ static function syncPushRemove(CRM_Queue_TaskContext $ctx, $listID) { * This also does the clean-up tasks of removing the temporary tables. */ static function syncPushAdd(CRM_Queue_TaskContext $ctx, $listID) { - CRM_Mailchimp_Utils::checkDebug('Start-CRM_Mailchimp_Form_Sync syncPushAdd $ctx= ', $ctx); CRM_Mailchimp_Utils::checkDebug('Start-CRM_Mailchimp_Form_Sync syncPushAdd $listID= ', $listID); // @todo take the remaining details from tmp_mailchimp_push_c @@ -301,7 +284,6 @@ static function syncPushAdd(CRM_Queue_TaskContext $ctx, $listID) { $merge_groups[$grouping_id] = array('id' => $grouping_id, 'groups' => array()); - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Form_Sync $merge_groups[$grouping_id]', $merge_groups[$grouping_id]); foreach ($groups as $group_id => $is_member) { if ($is_member) { $merge_groups[$grouping_id]['groups'][] = CRM_Mailchimp_Utils::getMCGroupName($listID, $grouping_id, $group_id); @@ -321,7 +303,6 @@ static function syncPushAdd(CRM_Queue_TaskContext $ctx, $listID) { } // Log the batch subscribe details - CRM_Core_Error::debug_var('Mailchimp syncPushAdd batchUnsubscribe $listID= ', $listID); CRM_Core_Error::debug_var('Mailchimp syncPushAdd batchSubscribe $batch= ', $batch); // Send Mailchimp Lists API Call. // http://apidocs.mailchimp.com/api/2.0/lists/batch-subscribe.php @@ -347,7 +328,7 @@ static function syncPushAdd(CRM_Queue_TaskContext $ctx, $listID) { } } } - CRM_Mailchimp_Utils::checkDebug('CRM_Mailchimp_Form_Sync syncPushAdd $result= ', $batchResult[$id]); + CRM_Mailchimp_Utils::checkDebug('CRM_Mailchimp_Form_Sync syncPushAdd $batchsubscriberesultinloop= ', $batchResult[$id]); } // debug: file_put_contents(DRUPAL_ROOT . '/logs/' . date('Y-m-d-His') . '-MC-push.log', print_r($result,1)); @@ -366,11 +347,6 @@ static function syncPushAdd(CRM_Queue_TaskContext $ctx, $listID) { CRM_Core_DAO::executeQuery("DROP TABLE tmp_mailchimp_push_m;"); CRM_Core_DAO::executeQuery("DROP TABLE tmp_mailchimp_push_c;"); - CRM_Mailchimp_Utils::checkDebug('get groupsss $grouping_id= ', $grouping_id); - CRM_Mailchimp_Utils::checkDebug('get groupssss $group_id= ', $group_id); - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Form_Sync syncPushAdd $result= ', $result); - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Form_Sync syncPushAdd $ctx= ', $ctx); - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Form_Sync syncPushAdd $listID= ', $listID); return CRM_Queue_Task::TASK_SUCCESS; diff --git a/CRM/Mailchimp/Utils.php b/CRM/Mailchimp/Utils.php index 0231525..37a2259 100644 --- a/CRM/Mailchimp/Utils.php +++ b/CRM/Mailchimp/Utils.php @@ -30,9 +30,6 @@ static function mailchimp() { * */ static function getGroupsToSync($groupIDs = array(), $mc_list_id = null, $membership_only = FALSE) { - CRM_Mailchimp_Utils::checkDebug('Start-CRM_Mailchimp_Utils getGroupsToSync $groupIDs', $groupIDs); - CRM_Mailchimp_Utils::checkDebug('Start-CRM_Mailchimp_Utils getGroupsToSync $mc_list_id', $mc_list_id); - CRM_Mailchimp_Utils::checkDebug('Start-CRM_Mailchimp_Utils getGroupsToSync $membership_only', $membership_only); $params = $groups = $temp = array(); @@ -82,9 +79,7 @@ static function getGroupsToSync($groupIDs = array(), $mc_list_id = null, $member 'civigroup_uses_cache' => (bool) (($dao->saved_search_id > 0) || (bool) $dao->children), ); } - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getGroupsToSync $groupIDs', $groupIDs); - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getGroupsToSync $mc_list_id', $mc_list_id); - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getGroupsToSync $membership_only', $membership_only); + CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getGroupsToSync $groups', $groups); return $groups; @@ -112,7 +107,11 @@ static function getMemberCountForGroupsToSync($groupIDs = array()) { SELECT count(*) FROM civicrm_group_contact_cache smartgroup_contact WHERE smartgroup_contact.group_id IN ($groupIDs)"; - return CRM_Core_DAO::singleValueQuery($smartGroupQuery); + $count = CRM_Core_DAO::singleValueQuery($smartGroupQuery); + CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getMemberCountForGroupsToSync $count', $count); + return $count; + + } else if (!empty($groupIDs)) { $groupIDs = implode(',', $groupIDs); @@ -120,9 +119,10 @@ static function getMemberCountForGroupsToSync($groupIDs = array()) { SELECT count(*) FROM civicrm_group_contact WHERE status = 'Added' AND group_id IN ($groupIDs)"; - return CRM_Core_DAO::singleValueQuery($query); + $count = CRM_Core_DAO::singleValueQuery($query); + CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getMemberCountForGroupsToSync $count', $count); + return $count; } - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getMemberCountForGroupsToSync $groupIDs', $groupIDs); return 0; } @@ -141,10 +141,8 @@ static function getMCGroupName($listID, $groupingID, $groupID) { if (empty($info[$groupingID]['groups'][$groupID])) { return NULL; } - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getMCGroupName $listID', $listID); - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getMCGroupName $groupingID', $groupingID); - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getMCGroupName $groupID', $groupID); - + CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getMCGroupName $info', $info[$groupingID]['groups'][$groupID]['name']); + return $info[$groupingID]['groups'][$groupID]['name']; } @@ -161,9 +159,8 @@ static function getMCGroupingName($listID, $groupingID) { if (empty($info[$groupingID])) { return NULL; } - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getMCGroupingName $listID', $listID); - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getMCGroupingName $groupingID', $groupingID); - + CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getMCGroupingName $info ', $info[$groupingID]['name']); + return $info[$groupingID]['name']; } @@ -206,7 +203,7 @@ static function getMCInterestGroupings($listID) { $mcLists = new Mailchimp_Lists(CRM_Mailchimp_Utils::mailchimp()); try { $results = $mcLists->interestGroupings($listID); - CRM_Mailchimp_Utils::checkDebug('Start-CRM_Mailchimp_Utils getMCInterestGroupings $results', $results); + } catch (Exception $e) { return NULL; @@ -229,21 +226,16 @@ static function getMCInterestGroupings($listID) { * */ foreach ($results as $grouping) { - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getMCInterestGroupings $grouping', $grouping); + $mapper[$listID][$grouping['id']] = $grouping; unset($mapper[$listID][$grouping['id']]['groups']); foreach ($grouping['groups'] as $group) { - - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getMCInterestGroupings $grouping', $group); - - $mapper[$listID][$grouping['id']]['groups'][$group['id']] = $group; - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getMCInterestGroupings $group', $group); } } } - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getMCInterestGroupings $listID', $listID); + CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getMCInterestGroupings $mapper', $mapper[$listID]); return $mapper[$listID]; } @@ -269,12 +261,11 @@ static function getMailchimpGroupIdFromName($listID, $groupName) { foreach ($results as $grouping) { foreach ($grouping['groups'] as $group) { if ($group['name'] == $groupName) { + CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getMailchimpGroupIdFromName= ', $group['id']); return $group['id']; } } } - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getMailchimpGroupIdFromName $listID', $listID); - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getMailchimpGroupIdFromName $groupName', $groupName); } static function getGroupIdForMailchimp($listID, $groupingID, $groupID) { @@ -305,11 +296,10 @@ static function getGroupIdForMailchimp($listID, $groupingID, $groupID) { ); $dao = CRM_Core_DAO::executeQuery($query, $params); if ($dao->fetch()) { + CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getGroupIdForMailchimp $dao->entity_id', $dao->entity_id); return $dao->entity_id; } - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getGroupIdForMailchimp $listID', $listID); - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getGroupIdForMailchimp $groupingID', $groupingID); - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getGroupIdForMailchimp $groupID', $groupID); + } /* @@ -367,8 +357,7 @@ static function updateContactDetails(&$params, $delay = FALSE) { // Create/Update Contact details $contactResult = civicrm_api('Contact' , 'create' , $contactParams); - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils updateContactDetails $params', $params); - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils updateContactDetails $delay', $delay); + CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils updateContactDetails $contactID', $contactResult['id']); return $contactResult['id']; } @@ -390,8 +379,7 @@ static function getContactFromEmail($email, $primary = TRUE) { while($dao->fetch()) { $contactids[] = $dao->contact_id; } - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getContactFromEmail $email', $email); - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getContactFromEmail $primary', $primary); + CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getContactFromEmail $contactids', $contactids); return $contactids; @@ -419,9 +407,6 @@ static function updateParamsExactMatch($contactids = array(), $params) { if(empty($params['LNAME'])) unset ($contactParams['last_name']); } - - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils updateParamsExactMatch $params', $params); - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils updateParamsExactMatch $contactids', $contactids); CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils updateParamsExactMatch $contactParams', $contactParams); return $contactParams; @@ -464,8 +449,7 @@ static function getCiviGroupIdsforMcGroupings($listID, $mcGroupings) { } } } - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getCiviGroupIdsforMcGroupings $listID', $listID); - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getCiviGroupIdsforMcGroupings $mcGroupings', $mcGroupings); + CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getCiviGroupIdsforMcGroupings $civiGroups', $civiGroups); return $civiGroups; } @@ -500,8 +484,7 @@ static function getGroupSubscriptionforMailchimpList($listID, $contactID) { $civiMcGroups[] = $dao->entity_id; } } - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getGroupSubscriptionforMailchimpList $listID', $listID); - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getGroupSubscriptionforMailchimpList $contactID', $contactID); + CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getGroupSubscriptionforMailchimpList $civiGroups', $civiGroups); return $civiMcGroups; @@ -565,7 +548,7 @@ static function deleteMCEmail($emailId = array() ) { CRM_Mailchimp_BAO_MCSync::create($params); } - + CRM_Mailchimp_Utils::checkDebug('Start-CRM_Mailchimp_Utils deleteMCEmail $toDelete', $toDelete); foreach ($toDelete as $listID => $vals) { // sync contacts using batchunsubscribe $mailchimp = new Mailchimp_Lists(CRM_Mailchimp_Utils::mailchimp()); @@ -577,8 +560,7 @@ static function deleteMCEmail($emailId = array() ) { TRUE ); } - CRM_Mailchimp_Utils::checkDebug('Start-CRM_Mailchimp_Utils deleteMCEmail $emailId', $emailId); - CRM_Mailchimp_Utils::checkDebug('Start-CRM_Mailchimp_Utils deleteMCEmail $toDelete', $toDelete); + return $toDelete; } @@ -604,6 +586,7 @@ static function getGroupContactObject($groupID, $start = null) { $groupContactCache->limit($start, CRM_Mailchimp_Form_Sync::BATCH_COUNT); } $groupContactCache->find(); + CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getGroupContactObject $groupContactCache', $groupContactCache); return $groupContactCache; } else { @@ -614,11 +597,10 @@ static function getGroupContactObject($groupID, $start = null) { $groupContact->limit($start, CRM_Mailchimp_Form_Sync::BATCH_COUNT); } $groupContact->find(); + CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getGroupContactObject $groupContact', $groupContact); return $groupContact; } } - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getGroupContactObject $groupID', $groupID); - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getGroupContactObject $start', $start); return FALSE; } /** @@ -643,6 +625,7 @@ static function getGroupMemberships($groupIDs) { $groupContactCache->limit($start, CRM_Mailchimp_Form_Sync::BATCH_COUNT); } $groupContactCache->find(); + CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getGroupMemberships $groupContactCache', $groupContactCache); return $groupContactCache; } else { @@ -653,11 +636,11 @@ static function getGroupMemberships($groupIDs) { $groupContact->limit($start, CRM_Mailchimp_Form_Sync::BATCH_COUNT); } $groupContact->find(); + CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getGroupMemberships $groupContact', $groupContact); return $groupContact; } } - CRM_Mailchimp_Utils::checkDebug('End-CRM_Mailchimp_Utils getGroupMemberships $groupIDs', $groupIDs); - + return FALSE; } diff --git a/README.md b/README.md index 824f817..4571e55 100644 --- a/README.md +++ b/README.md @@ -54,6 +54,8 @@ Steps to configure Mailchimp Webhook settings with the relevant CiviCRM Url: 1. To know the relevant CiviCRM url visit https://<>/civicrm/mailchimp/settings?reset=1. 2. In the “Security Key” field entering a key shows the complete webhook url. Note down the complete url. 3. Make sure webhook url is accessible to public. If not, just make sure anonymous / public user has “allow webhook posts” permission. + Note: For Wordpress, the following page is mandatory for right behaviour of webhook url. + (images/wordpress_civi_default_page.png) 4. Log in to your MailChimp account. 5. Navigate to your Lists. 6. Click Webhooks under Settings menu and Click ‘Add a New Webhook’ button. diff --git a/images/wordpress_civi_default_page.png b/images/wordpress_civi_default_page.png new file mode 100644 index 0000000..6407d27 Binary files /dev/null and b/images/wordpress_civi_default_page.png differ diff --git a/info.xml b/info.xml index 99eee05..4c2e330 100644 --- a/info.xml +++ b/info.xml @@ -8,8 +8,8 @@ Deepak Srivastava, Kajan, Parvez Saleh and Rich Lott (Artful Robot) support@vedaconsulting.co.uk - 2015-12-18 - 1.8.5 + 2016-01-08 + 1.8.6 stable 4.4