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

version updated to v2.6.2

Author: RishadAlam

bitwpfi.php

@@ -4,7 +4,7 @@
  * Plugin Name: Bit Integrations
  * Plugin URI:  https://bitapps.pro/bit-integrations
  * Description: Bit Integrations is a platform that integrates with over 290+ different platforms to help with various tasks on your WordPress site, like WooCommerce, Form builder, Page builder, LMS, Sales funnels, Bookings, CRM, Webhooks, Email marketing, Social media and Spreadsheets, etc
- * Version:     2.6.1
+ * Version:     2.6.2
  * Author:      Automation & Integration Plugin - Bit Apps
  * Author URI:  https://bitapps.pro
  * Text Domain: bit-integrations
@@ -24,7 +24,7 @@
 $btcbi_db_version = '1.1';
 
 // Define most essential constants.
-define('BTCBI_VERSION', '2.6.1');
+define('BTCBI_VERSION', '2.6.2');
 define('BTCBI_PLUGIN_MAIN_FILE', __FILE__);
 
 require_once plugin_dir_path(__FILE__) . 'includes/loader.php';

frontend-dev/src/components/AllIntegrations/CampaignMonitor/CampaignMonitorFieldMap.jsx

@@ -7,6 +7,7 @@ import { SmartTagField } from '../../../Utils/StaticData/SmartTagField'
 import MtInput from '../../Utilities/MtInput'
 import { generateMappedField } from './CampaignMonitorCommonFunc'
 import TagifyInput from '../../Utilities/TagifyInput'
+import { handleCustomValue } from '../IntegrationHelpers/IntegrationHelpers'
 
 export default function CampaignMonitorFieldMap({
   i,
@@ -54,12 +55,6 @@ export default function CampaignMonitorFieldMap({
     setCampaignMonitorConf(newConf)
   }
 
-  const handleCustomValue = (event, indx) => {
-    const newConf = { ...campaignMonitorConf }
-    newConf.field_map[indx].customValue = event.target.value
-    setCampaignMonitorConf(newConf)
-  }
-
   return (
     <div className="flx mt-2 mb-2 btcbi-field-map">
       <div className="flx integ-fld-wrp">

frontend-dev/src/components/AllIntegrations/Flowlu/FlowluFieldMap.jsx

@@ -4,16 +4,14 @@ import { $btcbi } from '../../../GlobalStates'
 import { SmartTagField } from '../../../Utils/StaticData/SmartTagField'
 import { __ } from '../../../Utils/i18nwrap'
 import CustomField from './CustomField'
-import { addFieldMap, delFieldMap, handleFieldMapping } from './IntegrationHelpers'
+import { addFieldMap, delFieldMap, handleCustomValue, handleFieldMapping } from './IntegrationHelpers'
+import TagifyInput from '../../Utilities/TagifyInput'
 
 export default function FlowluFieldMap({ i, formFields, field, flowluConf, setFlowluConf }) {
   const requiredFields =
-    (flowluConf?.flowluFields && flowluConf?.flowluFields.filter((fld) => fld.required === true)) ||
-    []
+    (flowluConf?.flowluFields && flowluConf?.flowluFields.filter(fld => fld.required === true)) || []
   const allNonRequiredFields =
-    (flowluConf?.flowluFields &&
-      flowluConf?.flowluFields.filter((fld) => fld.required === false)) ||
-    []
+    (flowluConf?.flowluFields && flowluConf?.flowluFields.filter(fld => fld.required === false)) || []
 
   const btcbi = useRecoilValue($btcbi)
   const { isPro } = btcbi
@@ -26,10 +24,10 @@ export default function FlowluFieldMap({ i, formFields, field, flowluConf, setFl
             className="btcd-paper-inp mr-2"
             name="formField"
             value={field.formField || ''}
-            onChange={(ev) => handleFieldMapping(ev, i, flowluConf, setFlowluConf)}>
+            onChange={ev => handleFieldMapping(ev, i, flowluConf, setFlowluConf)}>
             <option value="">{__('Select Field', 'bit-integrations')}</option>
             <optgroup label={__('Form Fields', 'bit-integrations')}>
-              {formFields?.map((f) => (
+              {formFields?.map(f => (
                 <option key={`ff-rm-${f.name}`} value={f.name}>
                   {f.label}
                 </option>
@@ -42,7 +40,7 @@ export default function FlowluFieldMap({ i, formFields, field, flowluConf, setFl
                 isPro ? '' : `(${__('Pro', 'bit-integrations')})`
               )}>
               {isPro &&
-                SmartTagField?.map((f) => (
+                SmartTagField?.map(f => (
                   <option key={`ff-rm-${f.name}`} value={f.name}>
                     {f.label}
                   </option>
@@ -51,25 +49,23 @@ export default function FlowluFieldMap({ i, formFields, field, flowluConf, setFl
           </select>
 
           {field.formField === 'custom' && (
-            <CustomField
-              field={field}
-              index={i}
-              conf={flowluConf}
-              setConf={setFlowluConf}
-              fieldValue="customValue"
-              fieldLabel="Custom Value"
+            <TagifyInput
+              onChange={e => handleCustomValue(e, i, flowluConf, setFlowluConf)}
+              label={__('Custom Value', 'bit-integrations')}
               className="mr-2"
+              type="text"
+              value={field.customValue}
+              placeholder={__('Custom Value', 'bit-integrations')}
+              formFields={formFields}
             />
           )}
 
           <select
             className="btcd-paper-inp"
             disabled={i < requiredFields.length}
             name="flowluFormField"
-            value={
-              i < requiredFields.length ? requiredFields[i].key || '' : field.flowluFormField || ''
-            }
-            onChange={(ev) => handleFieldMapping(ev, i, flowluConf, setFlowluConf)}>
+            value={i < requiredFields.length ? requiredFields[i].key || '' : field.flowluFormField || ''}
+            onChange={ev => handleFieldMapping(ev, i, flowluConf, setFlowluConf)}>
             <option value="">{__('Select Field', 'bit-integrations')}</option>
             {i < requiredFields.length ? (
               <option key={requiredFields[i].key} value={requiredFields[i].key}>