@@ -14,7 +20,13 @@ export default function Welcome({ setModal, isValidUser, integrations }) {
{__('Create Integration', 'bit-integrations')}
*/}
-
+
{__('Create Integration', 'bit-integrations')}
diff --git a/frontend/src/resource/sass/app.scss b/frontend/src/resource/sass/app.scss
index 185a0e920..556388634 100644
--- a/frontend/src/resource/sass/app.scss
+++ b/frontend/src/resource/sass/app.scss
@@ -3771,8 +3771,8 @@ select.btcd-paper-inp {
}
.bit-logo {
- background: rgb(15, 16, 49);
- background: linear-gradient(43deg, rgba(15, 16, 49, 1) 0%, rgba(29, 58, 75, 1) 100%);
+ // background: rgb(15, 16, 49);
+ // background: linear-gradient(43deg, rgba(15, 16, 49, 1) 0%, rgba(29, 58, 75, 1) 100%);
padding: 15px 15px 15px 19px;
border-radius: 28px;
box-shadow: 0 0 22px -7px #9498ce;
From 5653bd2be4f2b07c34bf84d3d3bbfc59f778bac7 Mon Sep 17 00:00:00 2001
From: Rishad Alam <101513331+RishadAlam@users.noreply.github.com>
Date: Sat, 28 Feb 2026 12:12:45 +0600
Subject: [PATCH 02/12] refactor: activeCampaign update contact
---
.../ActiveCampaign/RecordApiHelper.php | 172 ++++++++----------
1 file changed, 72 insertions(+), 100 deletions(-)
diff --git a/backend/Actions/ActiveCampaign/RecordApiHelper.php b/backend/Actions/ActiveCampaign/RecordApiHelper.php
index ff3ab33aa..c9e93160b 100644
--- a/backend/Actions/ActiveCampaign/RecordApiHelper.php
+++ b/backend/Actions/ActiveCampaign/RecordApiHelper.php
@@ -55,119 +55,55 @@ public function execute($integrationDetails, $fieldValues, $fieldMap, $actions,
$fieldData = [];
$customFields = [];
- foreach ($fieldMap as $fieldKey => $fieldPair) {
- if (!empty($fieldPair->activeCampaignField)) {
- if ($fieldPair->formField === 'custom' && isset($fieldPair->customValue) && !is_numeric($fieldPair->activeCampaignField)) {
- $fieldData[$fieldPair->activeCampaignField] = $fieldPair->customValue;
- } elseif (is_numeric($fieldPair->activeCampaignField) && $fieldPair->formField === 'custom' && isset($fieldPair->customValue)) {
- $customFields[] = ['field' => (int) $fieldPair->activeCampaignField, 'value' => $fieldPair->customValue];
- } elseif (is_numeric($fieldPair->activeCampaignField)) {
- $customFields[] = ['field' => (int) $fieldPair->activeCampaignField, 'value' => $fieldValues[$fieldPair->formField]];
+ // Efficient field mapping
+ foreach ($fieldMap as $fieldPair) {
+ if (empty($fieldPair->activeCampaignField)) {
+ continue;
+ }
+ $acField = $fieldPair->activeCampaignField;
+ $formField = $fieldPair->formField;
+ $customValue = $fieldPair->customValue ?? null;
+
+ if ($formField === 'custom' && isset($customValue)) {
+ if (is_numeric($acField)) {
+ $customFields[] = ['field' => (int) $acField, 'value' => $customValue];
} else {
- $fieldData[$fieldPair->activeCampaignField] = $fieldValues[$fieldPair->formField];
+ $fieldData[$acField] = $customValue;
}
+ } elseif (is_numeric($acField)) {
+ $customFields[] = ['field' => (int) $acField, 'value' => $fieldValues[$formField] ?? ''];
+ } else {
+ $fieldData[$acField] = $fieldValues[$formField] ?? '';
}
}
- if (!empty($customFields)) {
+ if ($customFields) {
$fieldData['fieldValues'] = $customFields;
}
- $activeCampaign['contact'] = (object) $fieldData;
- $existContact = $this->existContact($activeCampaign['contact']->email);
+ $activeCampaign = ['contact' => (object) $fieldData];
+ $email = $fieldData['email'] ?? null;
+ $existContact = $email ? $this->existContact($email) : null;
+ $updateContact = !empty($actions->update);
+ $hasContact = !empty($existContact->contacts);
$type = 'notSet';
- $updateContact = $actions->update;
- if (!$updateContact && empty($existContact->contacts)) {
+ $recordApiResponse = null;
+
+ if (!$updateContact && !$hasContact) {
$recordApiResponse = $this->storeOrModifyRecord('contacts', wp_json_encode($activeCampaign));
$type = 'insert';
- if (isset($recordApiResponse->contact)) {
- $recordApiResponse = ['success' => true, 'id' => $recordApiResponse->contact->id];
- if (isset($listId) && !empty($listId)) {
- $data['contactList'] = (object) [
- 'list' => $listId,
- 'contact' => $recordApiResponse['id'],
- 'status' => 1
- ];
- $this->storeOrModifyRecord('contactLists', wp_json_encode($data));
- }
- if (isset($tags) && !empty($tags)) {
- foreach ($tags as $tag) {
- $data['contactTag'] = (object) [
- 'contact' => $recordApiResponse['id'],
- 'tag' => $tag
- ];
- $this->storeOrModifyRecord('contactTags', wp_json_encode($data));
- }
- }
- if (isset($integrationDetails->selectedAccount) && !empty($integrationDetails->selectedAccount)) {
- $data['accountContact'] = [
- 'account' => $listId,
- 'contact' => $recordApiResponse['id'],
- ];
- if (isset($integrationDetails->job_title)) {
- $data['accountContact'] += ['jobTitle' => $integrationDetails->job_title];
- }
- $this->storeOrModifyRecord('accountContacts', wp_json_encode((object) $data));
- }
- }
- } elseif ($updateContact && !empty($existContact->contacts)) {
- $recordApiResponse = $this->updateRecord($existContact->contacts[0]->id, $activeCampaign, $existContact);
- if (isset($tags) && !empty($tags)) {
- foreach ($tags as $tag) {
- $data['contactTag'] = (object) [
- 'contact' => $recordApiResponse->contact->id,
- 'tag' => $tag
- ];
- $this->storeOrModifyRecord('contactTags', wp_json_encode($data));
- }
- }
- if (isset($recordApiResponse->contact)) {
- $recordApiResponse = ['success' => true, 'id' => $recordApiResponse->contact->id];
- }
- if (isset($integrationDetails->selectedAccount) && !empty($integrationDetails->selectedAccount)) {
- $data['accountContact'] = [
- 'account' => $listId,
- 'contact' => $recordApiResponse->contact->id,
- ];
- if (isset($integrationDetails->job_title)) {
- $data['accountContact'] += ['jobTitle' => $integrationDetails->job_title];
- }
- $this->storeOrModifyRecord('accountContacts', wp_json_encode((object) $data));
- }
+ } elseif ($updateContact && $hasContact) {
+ $contactId = $existContact->contacts[0]->id;
+ $recordApiResponse = $this->updateRecord($contactId, $activeCampaign, $existContact);
$type = 'update';
- } elseif ($updateContact && empty($existContact->contacts)) {
+ } elseif ($updateContact && !$hasContact) {
$recordApiResponse = $this->storeOrModifyRecord('contacts', wp_json_encode($activeCampaign));
$type = 'insert';
- if (isset($recordApiResponse->contact)) {
- $recordApiResponse = ['success' => true, 'id' => $recordApiResponse->contact->id];
- if (isset($listId) && !empty($listId)) {
- $data['contactList'] = (object) [
- 'list' => $listId,
- 'contact' => $recordApiResponse['id'],
- 'status' => 1
- ];
- $this->storeOrModifyRecord('contactLists', wp_json_encode($data));
- }
- if (isset($tags) && !empty($tags)) {
- foreach ($tags as $tag) {
- $data['contactTag'] = (object) [
- 'contact' => $recordApiResponse['id'],
- 'tag' => $tag
- ];
- $this->storeOrModifyRecord('contactTags', wp_json_encode($data));
- }
- }
- if (isset($integrationDetails->selectedAccount) && !empty($integrationDetails->selectedAccount)) {
- $data['accountContact'] = [
- 'account' => $listId,
- 'contact' => $recordApiResponse['id'],
- ];
- if (isset($integrationDetails->job_title)) {
- $data['accountContact'] += ['jobTitle' => $integrationDetails->job_title];
- }
- $this->storeOrModifyRecord('accountContacts', wp_json_encode((object) $data));
- }
- }
+ }
+
+ if (!empty($recordApiResponse->contact)) {
+ $related = $this->handleRelatedActions($recordApiResponse->contact->id, $listId, $tags, $integrationDetails);
+ $recordApiResponse = (object) array_merge((array) $recordApiResponse, $related);
}
if ($type === 'notSet') {
@@ -175,7 +111,7 @@ public function execute($integrationDetails, $fieldValues, $fieldMap, $actions,
return false;
}
- if ($recordApiResponse && isset($recordApiResponse->errors)) {
+ if ($recordApiResponse && !empty($recordApiResponse->errors)) {
LogHandler::save($this->_integrationID, ['type' => 'record', 'type_name' => $type], 'error', $recordApiResponse->errors);
} else {
LogHandler::save($this->_integrationID, ['type' => 'record', 'type_name' => $type], 'success', $recordApiResponse);
@@ -184,6 +120,42 @@ public function execute($integrationDetails, $fieldValues, $fieldMap, $actions,
return $recordApiResponse;
}
+ private function handleRelatedActions($contactId, $listId, $tags, $integrationDetails)
+ {
+ $data = [];
+ $result = [];
+ if (!empty($listId)) {
+ $data['contactList'] = (object) [
+ 'list' => $listId,
+ 'contact' => $contactId,
+ 'status' => 1
+ ];
+ $result['contactLists'] = $this->storeOrModifyRecord('contactLists', wp_json_encode($data));
+ }
+ if (!empty($tags)) {
+ $result['contactTags'] = [];
+ foreach ($tags as $tag) {
+ $data['contactTag'] = (object) [
+ 'contact' => $contactId,
+ 'tag' => $tag
+ ];
+ $result['contactTags'][] = $this->storeOrModifyRecord('contactTags', wp_json_encode($data));
+ }
+ }
+ if (!empty($integrationDetails->selectedAccount)) {
+ $data['accountContact'] = [
+ 'account' => $integrationDetails->selectedAccount,
+ 'contact' => $contactId,
+ ];
+ if (!empty($integrationDetails->job_title)) {
+ $data['accountContact']['jobTitle'] = $integrationDetails->job_title;
+ }
+ $result['accountContacts'] = $this->storeOrModifyRecord('accountContacts', wp_json_encode((object) $data));
+ }
+
+ return $result;
+ }
+
private function existContact($email)
{
$searchEndPoint = "{$this->_apiEndpoint}/contacts?email={$email}";
From b6f1dbf3dea2511e11da8742ae6c7548453e58aa Mon Sep 17 00:00:00 2001
From: Rishad Alam <101513331+RishadAlam@users.noreply.github.com>
Date: Sat, 28 Feb 2026 12:25:40 +0600
Subject: [PATCH 03/12] feat: active campaign tags update feature added
---
.../ActiveCampaign/RecordApiHelper.php | 12 ++++++++----
backend/Core/Util/HttpHelper.php | 5 +++++
.../ActiveCampaign/ActiveCampaignActions.jsx | 19 +++++++++++++------
3 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/backend/Actions/ActiveCampaign/RecordApiHelper.php b/backend/Actions/ActiveCampaign/RecordApiHelper.php
index c9e93160b..a4865a2a4 100644
--- a/backend/Actions/ActiveCampaign/RecordApiHelper.php
+++ b/backend/Actions/ActiveCampaign/RecordApiHelper.php
@@ -130,16 +130,20 @@ private function handleRelatedActions($contactId, $listId, $tags, $integrationDe
'contact' => $contactId,
'status' => 1
];
- $result['contactLists'] = $this->storeOrModifyRecord('contactLists', wp_json_encode($data));
+ $result['lists'] = $this->storeOrModifyRecord('contactLists', wp_json_encode($data));
}
if (!empty($tags)) {
- $result['contactTags'] = [];
+ if ($integrationDetails->actions->tagUpdate) {
+ $result['tags_removed'] = HttpHelper::delete("{$this->_apiEndpoint}/contactTags/{$contactId}", null, $this->_defaultHeader);
+ }
+
+ $result['tags_added'] = [];
foreach ($tags as $tag) {
$data['contactTag'] = (object) [
'contact' => $contactId,
'tag' => $tag
];
- $result['contactTags'][] = $this->storeOrModifyRecord('contactTags', wp_json_encode($data));
+ $result['tags_added'][] = $this->storeOrModifyRecord('contactTags', wp_json_encode($data));
}
}
if (!empty($integrationDetails->selectedAccount)) {
@@ -150,7 +154,7 @@ private function handleRelatedActions($contactId, $listId, $tags, $integrationDe
if (!empty($integrationDetails->job_title)) {
$data['accountContact']['jobTitle'] = $integrationDetails->job_title;
}
- $result['accountContacts'] = $this->storeOrModifyRecord('accountContacts', wp_json_encode((object) $data));
+ $result['account'] = $this->storeOrModifyRecord('accountContacts', wp_json_encode((object) $data));
}
return $result;
diff --git a/backend/Core/Util/HttpHelper.php b/backend/Core/Util/HttpHelper.php
index dd4fc9038..9d964731d 100644
--- a/backend/Core/Util/HttpHelper.php
+++ b/backend/Core/Util/HttpHelper.php
@@ -23,6 +23,11 @@ public static function put($url, $data, $headers = null, $options = null)
return static::request($url, 'PUT', $data, $headers, $options);
}
+ public static function delete($url, $data, $headers = null, $options = null)
+ {
+ return static::request($url, 'DELETE', $data, $headers, $options);
+ }
+
public static function request($url, $type, $data, $headers = null, $options = null)
{
$headers['user-agent'] = 'wordpress/bit-integrations';
diff --git a/frontend/src/components/AllIntegrations/ActiveCampaign/ActiveCampaignActions.jsx b/frontend/src/components/AllIntegrations/ActiveCampaign/ActiveCampaignActions.jsx
index e6cfb21be..6881f978b 100644
--- a/frontend/src/components/AllIntegrations/ActiveCampaign/ActiveCampaignActions.jsx
+++ b/frontend/src/components/AllIntegrations/ActiveCampaign/ActiveCampaignActions.jsx
@@ -6,13 +6,12 @@ import TableCheckBox from '../../Utilities/TableCheckBox'
export default function ActiveCampaignActions({ activeCampaingConf, setActiveCampaingConf }) {
const actionHandler = (e, type) => {
const newConf = { ...activeCampaingConf }
- if (type === 'update') {
- if (e.target.checked) {
- newConf.actions.update = true
- } else {
- delete newConf.actions.update
- }
+ if (e.target.checked) {
+ newConf.actions[type] = true
+ } else {
+ delete newConf.actions[type]
}
+
setActiveCampaingConf({ ...newConf })
}
@@ -26,6 +25,14 @@ export default function ActiveCampaignActions({ activeCampaingConf, setActiveCam
title={__('Update ActiveCampaign', 'bit-integrations')}
subTitle={__('Update Responses with ActiveCampaign existing email?', 'bit-integrations')}
/>
+