Merge pull request #72 from Bit-Apps-Pro/rishad-dev-tmp

fixed some minor bugs

Author: RishadAlam

frontend-dev/src/components/AllIntegrations/Freshdesk/FreshdeskAuthorization.jsx

@@ -39,9 +39,19 @@ export default function FreshdeskAuthorization({
   }
 
   const freshdeskInstructions = `
-            <h4>${__('App Domain Example', 'bit-integrations')}</h4>
+            <h4>${__('Locate Your App Domain', 'bit-integrations')}</h4>
             <ul>
-                <li>https://domain-help.freshdesk.com/</li>
+                <li>${__('Access your Freshdesk account.', 'bit-integrations')}</li>
+                <li>${__('Copy the URL displayed in your browser’s address bar', 'bit-integrations')} (e.g., https://domain.freshdesk.com/)</li>
+                <li>${__('Paste the copied App Domain into the designated “App Domain” field within the integrations you’re setting up.', 'bit-integrations')}</li>
+            </ul>
+            <h4>${__('Retrieve Your App API Key', 'bit-integrations')}</h4>
+            <ul>
+                <li>${__('Within your Freshdesk account, click on your profile icon, situated in the top right corner.', 'bit-integrations')}</li>
+                <li>${__('Select “Profile Settings” from the options that appear.', 'bit-integrations')}</li>
+                <li>${__('Locate your App API key, prominently displayed on the top right side of the Profile Settings page.', 'bit-integrations')}</li>
+                <li>${__('Copy this key.', 'bit-integrations')}</li>
+                <li>${__('Paste the copied App API key into the designated “App API key” field within the integrations you’re configuring.', 'bit-integrations')}</li>
             </ul>`
 
   return (
@@ -69,17 +79,6 @@ export default function FreshdeskAuthorization({
         disabled={isInfo}
       />
 
-      <small className="d-blk mt-5">
-        {__('To get access Token , Please Visit', 'bit-integrations')}{' '}
-        <a
-          className="btcd-link"
-          href="https://bitcode-help.freshdesk.com/a/profiles/72009210017/edit"
-          target="_blank"
-          rel="noreferrer">
-          {__('FreshDesk Console', 'bit-integrations')}
-        </a>
-      </small>
-
       <div className="mt-3">
         <b>{__('Your App Domain:', 'bit-integrations')}</b>
       </div>
@@ -92,6 +91,7 @@ export default function FreshdeskAuthorization({
         placeholder={__('App Domain...', 'bit-integrations')}
         disabled={isInfo}
       />
+      <small className="d-blk mt-2">{`${__('App Domain Example', 'bit-integrations')}: https://domain.freshdesk.com`}</small>
       <div style={{ color: 'red' }}>{error.app_domain}</div>
 
       <div className="mt-3">
@@ -106,6 +106,16 @@ export default function FreshdeskAuthorization({
         placeholder={__('Access Token...', 'bit-integrations')}
         disabled={isInfo}
       />
+      <small className="d-blk mt-2">
+        {__('To get access Token , Please Visit', 'bit-integrations')}{' '}
+        <a
+          className="btcd-link"
+          href={`${freshdeskConf?.app_domain || 'https://domain.freshdesk.com'}/a/profiles/72009210017/edit`}
+          target="_blank"
+          rel="noreferrer">
+          {__('FreshDesk Console', 'bit-integrations')}
+        </a>
+      </small>
       <div style={{ color: 'red' }}>{error.api_key}</div>
 
       {!isInfo && (

frontend-dev/src/components/AllIntegrations/IntegrationHelpers/IntegrationHelpers.js

@@ -150,7 +150,8 @@ export const saveIntegConfig = async (
     tmpConf = LifterLmsStateIH(tmpConf, dataFlow)
   } else if (flow.triggered_entity === 'MasterStudyLms') {
     const dataFlow = edit ? flow?.flow_details : flow?.triggerData
-    tmpConf = MasterStudyLmsStateIH(tmpConf, dataFlow, flow?.triggered_entity_id)
+    const formID = dataFlow?.formID || flow?.triggered_entity_id
+    tmpConf = MasterStudyLmsStateIH(tmpConf, dataFlow, formID)
   } else if (flow.triggered_entity === 'ThriveApprentice') {
     const dataFlow = edit ? flow?.flow_details : flow?.triggerData
     tmpConf = ThriveApprenticeStateIH(tmpConf, dataFlow)
@@ -332,7 +333,8 @@ export const saveActionConf = async ({
     tmpConf = LifterLmsStateIH(tmpConf, dataFlow)
   } else if (flow.triggered_entity === 'MasterStudyLms') {
     const dataFlow = edit ? flow?.flow_details : flow?.triggerData
-    tmpConf = MasterStudyLmsStateIH(tmpConf, dataFlow, flow?.triggered_entity_id)
+    const formID = dataFlow?.formID || flow?.triggered_entity_id
+    tmpConf = MasterStudyLmsStateIH(tmpConf, dataFlow, formID)
   } else if (flow.triggered_entity === 'ThriveApprentice') {
     const dataFlow = edit ? flow?.flow_details : flow?.triggerData
     tmpConf = ThriveApprenticeStateIH(tmpConf, dataFlow)

includes/Actions/Freshdesk/FreshdeskController.php

@@ -6,8 +6,8 @@
 
 namespace BitCode\FI\Actions\Freshdesk;
 
-use BitCode\FI\Core\Util\HttpHelper;
 use WP_Error;
+use BitCode\FI\Core\Util\HttpHelper;
 
 /**
  * Provide functionality for Freshdesk integration
@@ -42,10 +42,9 @@ public function checkAuthorizationAndFetchTickets($tokenRequestParams)
         ];
 
         $apiEndpoint = $tokenRequestParams->app_domain . '/api/v2/tickets';
-
         $apiResponse = HttpHelper::get($apiEndpoint, null, $header);
 
-        if (is_wp_error($apiResponse) || empty($apiResponse[0]->id)) {
+        if (is_wp_error($apiResponse) || HttpHelper::$responseCode !== 200) {
             wp_send_json_error(
                 empty($apiResponse->error) ? 'Unknown' : $apiResponse->error,
                 400

includes/Actions/OmniSend/RecordApiHelper.php

@@ -6,9 +6,9 @@
 
 namespace BitCode\FI\Actions\OmniSend;
 
-use BitCode\FI\Log\LogHandler;
 use BitCode\FI\Core\Util\Common;
 use BitCode\FI\Core\Util\HttpHelper;
+use BitCode\FI\Log\LogHandler;
 
 /**
  * Provide functionality for Record insert, upsert
@@ -103,7 +103,7 @@ public function execute(
         $emailStatus,
         $smsStatus,
         $fieldValues,
-        $fieldMap,
+        $fieldMap
     ) {
         $finalData = $this->generateReqDataFromFieldMap($fieldValues, $fieldMap);
         $apiResponse = $this->addContact(

includes/Flow/Flow.php

@@ -469,8 +469,8 @@ public static function execute($triggered_entity, $triggered_entity_id, $data, $
                         $integrationName = 'Registration';
 
                         break;
-                    case 'Zoho Marketing Automation(Zoho Marketing Hub)':
-                        $integrationName = 'Zoho Marketing Hub';
+                    case 'ZohoMarketingAutomation(ZohoMarketingHub)':
+                        $integrationName = 'ZohoMarketingHub';
 
                         break;