fix: perfexCRM custom field # tags issue fixed

Author: RishadAlam

frontend-dev/src/components/AllIntegrations/PerfexCRM/PerfexCRMFieldMap.jsx

@@ -4,22 +4,17 @@ 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 PerfexCRMFieldMap({
-  i,
-  formFields,
-  field,
-  perfexCRMConf,
-  setPerfexCRMConf
-}) {
+export default function PerfexCRMFieldMap({ i, formFields, field, perfexCRMConf, setPerfexCRMConf }) {
   const requiredFields =
     (perfexCRMConf?.perfexCRMFields &&
-      perfexCRMConf?.perfexCRMFields.filter((fld) => fld.required === true)) ||
+      perfexCRMConf?.perfexCRMFields.filter(fld => fld.required === true)) ||
     []
   const allNonRequiredFields =
     (perfexCRMConf?.perfexCRMFields &&
-      perfexCRMConf?.perfexCRMFields.filter((fld) => fld.required === false)) ||
+      perfexCRMConf?.perfexCRMFields.filter(fld => fld.required === false)) ||
     []
 
   const btcbi = useRecoilValue($btcbi)
@@ -33,10 +28,10 @@ export default function PerfexCRMFieldMap({
             className="btcd-paper-inp mr-2"
             name="formField"
             value={field.formField || ''}
-            onChange={(ev) => handleFieldMapping(ev, i, perfexCRMConf, setPerfexCRMConf)}>
+            onChange={ev => handleFieldMapping(ev, i, perfexCRMConf, setPerfexCRMConf)}>
             <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>
@@ -49,7 +44,7 @@ export default function PerfexCRMFieldMap({
                 isPro ? '' : `(${__('Pro', 'bit-integrations')})`
               )}>
               {isPro &&
-                SmartTagField?.map((f) => (
+                SmartTagField?.map(f => (
                   <option key={`ff-rm-${f.name}`} value={f.name}>
                     {f.label}
                   </option>
@@ -58,14 +53,14 @@ export default function PerfexCRMFieldMap({
           </select>
 
           {field.formField === 'custom' && (
-            <CustomField
-              field={field}
-              index={i}
-              conf={perfexCRMConf}
-              setConf={setPerfexCRMConf}
-              fieldValue="customValue"
-              fieldLabel="Custom Value"
+            <TagifyInput
+              onChange={e => handleCustomValue(e, i, perfexCRMConf, setPerfexCRMConf)}
+              label={__('Custom Value', 'bit-integrations')}
               className="mr-2"
+              type="text"
+              value={field.customValue}
+              placeholder={__('Custom Value', 'bit-integrations')}
+              formFields={formFields}
             />
           )}
 
@@ -74,11 +69,9 @@ export default function PerfexCRMFieldMap({
             disabled={i < requiredFields.length}
             name="perfexCRMFormField"
             value={
-              i < requiredFields.length
-                ? requiredFields[i].key || ''
-                : field.perfexCRMFormField || ''
+              i < requiredFields.length ? requiredFields[i].key || '' : field.perfexCRMFormField || ''
             }
-            onChange={(ev) => handleFieldMapping(ev, i, perfexCRMConf, setPerfexCRMConf)}>
+            onChange={ev => handleFieldMapping(ev, i, perfexCRMConf, setPerfexCRMConf)}>
             <option value="">{__('Select Field', 'bit-integrations')}</option>
             {i < requiredFields.length ? (
               <option key={requiredFields[i].key} value={requiredFields[i].key}>

includes/Actions/PerfexCRM/RecordApiHelper.php

@@ -160,7 +160,7 @@ public function generateReqDataFromFieldMap($data, $fieldMap)
         foreach ($fieldMap as $value) {
             $triggerValue = $value->formField;
             $actionValue = $value->perfexCRMFormField;
-            $dataFinal[$actionValue] = ($triggerValue === 'custom') ? Common::replaceFieldWithValue($value->customValue, $data) : $data[$triggerValue];
+            $dataFinal[$actionValue] = ($triggerValue === 'custom' && !empty($value->customValue)) ? Common::replaceFieldWithValue($value->customValue, $data) : $data[$triggerValue];
         }
 
         return $dataFinal;