Skip to content
Snippets Groups Projects
Commit c32dc6c5 authored by Prasad's avatar Prasad
Browse files

Merge branch '295135_LCDM' into 'foreall' 

E-all Settings -Lead Conversion Data Mapping

See merge request !1217
parents 7a6279b5 61e67482
No related branches found
No related tags found
2 merge requests!1233E_ALL fixes across modules for PHP 8.x,!1217E-all Settings -Lead Conversion Data Mapping
Hide whitespace changes
Inline Side-by-side
layouts/v7/modules/Settings/Leads/LeadMappingEdit.tpl
+ 3
− 3
View file @ c32dc6c5
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
{foreach key=FIELD_TYPE item=FIELDS_INFO from=$ACCOUNTS_MODULE_MODEL->getFields()} {foreach key=FIELD_TYPE item=FIELDS_INFO from=$ACCOUNTS_MODULE_MODEL->getFields()}
{foreach key=FIELD_ID item=FIELD_OBJECT from=$FIELDS_INFO} {foreach key=FIELD_ID item=FIELD_OBJECT from=$FIELDS_INFO}
{if $MAPPING_ARRAY['Leads']['fieldDataType'] eq $FIELD_TYPE} {if $MAPPING_ARRAY['Leads']['fieldDataType'] eq $FIELD_TYPE}
<option data-type="{$FIELD_TYPE}" {if $FIELD_ID eq $MAPPING_ARRAY['Accounts']['id']} selected {/if} label="{vtranslate($FIELD_OBJECT->get('label'), $ACCOUNTS_MODULE_MODEL->getName())}" value="{$FIELD_ID}"> <option data-type="{$FIELD_TYPE}" {if isset($MAPPING_ARRAY['Accounts']['id']) && $FIELD_ID eq $MAPPING_ARRAY['Accounts']['id']} selected {/if} label="{vtranslate($FIELD_OBJECT->get('label'), $ACCOUNTS_MODULE_MODEL->getName())}" value="{$FIELD_ID}">
{vtranslate($FIELD_OBJECT->get('label'), $ACCOUNTS_MODULE_MODEL->getName())} {vtranslate($FIELD_OBJECT->get('label'), $ACCOUNTS_MODULE_MODEL->getName())}
</option> </option>
{/if} {/if}
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
{foreach key=FIELD_TYPE item=FIELDS_INFO from=$CONTACTS_MODULE_MODEL->getFields()} {foreach key=FIELD_TYPE item=FIELDS_INFO from=$CONTACTS_MODULE_MODEL->getFields()}
{foreach key=FIELD_ID item=FIELD_OBJECT from=$FIELDS_INFO} {foreach key=FIELD_ID item=FIELD_OBJECT from=$FIELDS_INFO}
{if $MAPPING_ARRAY['Leads']['fieldDataType'] eq $FIELD_TYPE} {if $MAPPING_ARRAY['Leads']['fieldDataType'] eq $FIELD_TYPE}
<option data-type="{$FIELD_TYPE}" {if $FIELD_ID eq $MAPPING_ARRAY['Contacts']['id']} selected {/if} label="{vtranslate($FIELD_OBJECT->get('label'), $CONTACTS_MODULE_MODEL->getName())}" value="{$FIELD_ID}"> <option data-type="{$FIELD_TYPE}" {if isset($MAPPING_ARRAY['Contacts']['id']) && $FIELD_ID eq $MAPPING_ARRAY['Contacts']['id']} selected {/if} label="{vtranslate($FIELD_OBJECT->get('label'), $CONTACTS_MODULE_MODEL->getName())}" value="{$FIELD_ID}">
{vtranslate($FIELD_OBJECT->get('label'), $CONTACTS_MODULE_MODEL->getName())} {vtranslate($FIELD_OBJECT->get('label'), $CONTACTS_MODULE_MODEL->getName())}
</option> </option>
{/if} {/if}
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
{foreach key=FIELD_TYPE item=FIELDS_INFO from=$POTENTIALS_MODULE_MODEL->getFields()} {foreach key=FIELD_TYPE item=FIELDS_INFO from=$POTENTIALS_MODULE_MODEL->getFields()}
{foreach key=FIELD_ID item=FIELD_OBJECT from=$FIELDS_INFO} {foreach key=FIELD_ID item=FIELD_OBJECT from=$FIELDS_INFO}
{if $MAPPING_ARRAY['Leads']['fieldDataType'] eq $FIELD_TYPE} {if $MAPPING_ARRAY['Leads']['fieldDataType'] eq $FIELD_TYPE}
<option data-type="{$FIELD_TYPE}" {if $FIELD_ID eq $MAPPING_ARRAY['Potentials']['id']} selected {/if} label="{vtranslate($FIELD_OBJECT->get('label'), $POTENTIALS_MODULE_MODEL->getName())}" value="{$FIELD_ID}"> <option data-type="{$FIELD_TYPE}" {if isset($MAPPING_ARRAY['Potentials']['id']) && $FIELD_ID eq $MAPPING_ARRAY['Potentials']['id']} selected {/if} label="{vtranslate($FIELD_OBJECT->get('label'), $POTENTIALS_MODULE_MODEL->getName())}" value="{$FIELD_ID}">
{vtranslate($FIELD_OBJECT->get('label'), $POTENTIALS_MODULE_MODEL->getName())} {vtranslate($FIELD_OBJECT->get('label'), $POTENTIALS_MODULE_MODEL->getName())}
</option> </option>
{/if} {/if}
......
layouts/v7/modules/Settings/Leads/MappingDetail.tpl
+ 15
− 3
View file @ c32dc6c5
...@@ -52,9 +52,21 @@ ...@@ -52,9 +52,21 @@
</td> </td>
<td width="10%">{vtranslate({$MAPPING['Leads']['label']}, 'Leads')}</td> <td width="10%">{vtranslate({$MAPPING['Leads']['label']}, 'Leads')}</td>
<td width="10%">{vtranslate({$MAPPING['Leads']['fieldDataType']}, $QUALIFIED_MODULE)}</td> <td width="10%">{vtranslate({$MAPPING['Leads']['fieldDataType']}, $QUALIFIED_MODULE)}</td>
<td width="10%">{vtranslate({$MAPPING['Accounts']['label']}, 'Accounts')}</td> <td width="10%">
<td width="10%">{vtranslate({$MAPPING['Contacts']['label']}, 'Contacts')}</td> {if isset($MAPPING['Accounts']['label'])}
<td width="10%">{vtranslate({$MAPPING['Potentials']['label']}, 'Potentials')}</td> {vtranslate({$MAPPING['Accounts']['label']}, 'Accounts')}
{/if}
</td>
<td width="10%">
{if isset($MAPPING['Contacts']['label'])}
{vtranslate({$MAPPING['Contacts']['label']}, 'Contacts')}</td>
{/if}
</td>
<td width="10%">
{if isset($MAPPING['Potentials']['label'])}
{vtranslate({$MAPPING['Potentials']['label']}, 'Potentials')}</td>
{/if}
</td>
</tr> </tr>
{/foreach} {/foreach}
</tbody> </tbody>
......
modules/Settings/Leads/models/Mapping.php
+ 6
− 6
View file @ c32dc6c5
...@@ -75,7 +75,7 @@ class Settings_Leads_Mapping_Model extends Settings_Vtiger_Module_Model { ...@@ -75,7 +75,7 @@ class Settings_Leads_Mapping_Model extends Settings_Vtiger_Module_Model {
* @return <Array> list of mapping details * @return <Array> list of mapping details
*/ */
public function getMapping($editable = false) { public function getMapping($editable = false) {
if (!$this->mapping) { if (!property_exists($this,'mapping') || !$this->mapping) {
$db = PearDatabase::getInstance(); $db = PearDatabase::getInstance();
$query = 'SELECT * FROM vtiger_convertleadmapping'; $query = 'SELECT * FROM vtiger_convertleadmapping';
if ($editable) { if ($editable) {
...@@ -102,9 +102,9 @@ class Settings_Leads_Mapping_Model extends Settings_Vtiger_Module_Model { ...@@ -102,9 +102,9 @@ class Settings_Leads_Mapping_Model extends Settings_Vtiger_Module_Model {
$finalMapping[$mappingId] = array( $finalMapping[$mappingId] = array(
'editable' => $mappingDetails['editable'], 'editable' => $mappingDetails['editable'],
'Leads' => $fieldLabelsList[$mappingDetails['leadfid']], 'Leads' => $fieldLabelsList[$mappingDetails['leadfid']],
'Accounts' => $fieldLabelsList[$mappingDetails['accountfid']], 'Accounts' => isset($fieldLabelsList[$mappingDetails['accountfid']]) ? $fieldLabelsList[$mappingDetails['accountfid']] : null,
'Contacts' => $fieldLabelsList[$mappingDetails['contactfid']], 'Contacts' => isset($fieldLabelsList[$mappingDetails['contactfid']]) ? $fieldLabelsList[$mappingDetails['contactfid']] : null,
'Potentials'=> $fieldLabelsList[$mappingDetails['potentialfid']] 'Potentials'=> isset($fieldLabelsList[$mappingDetails['potentialfid']]) ? $fieldLabelsList[$mappingDetails['potentialfid']] : null
); );
} }
...@@ -154,8 +154,8 @@ class Settings_Leads_Mapping_Model extends Settings_Vtiger_Module_Model { ...@@ -154,8 +154,8 @@ class Settings_Leads_Mapping_Model extends Settings_Vtiger_Module_Model {
$db = PearDatabase::getInstance(); $db = PearDatabase::getInstance();
$deleteMappingsList = $updateMappingsList = $createMappingsList = array(); $deleteMappingsList = $updateMappingsList = $createMappingsList = array();
foreach ($mapping as $mappingDetails) { foreach ($mapping as $mappingDetails) {
$mappingId = $mappingDetails['mappingId']; $mappingId = isset($mappingDetails['mappingId']) ? $mappingDetails['mappingId'] : null;
if ($mappingDetails['lead']) { if (isset($mappingDetails['lead']) && $mappingDetails['lead']) {
if ($mappingId) { if ($mappingId) {
if ((array_key_exists('deletable', $mappingDetails)) || (!$mappingDetails['account'] && !$mappingDetails['contact'] && !$mappingDetails['potential'])) { if ((array_key_exists('deletable', $mappingDetails)) || (!$mappingDetails['account'] && !$mappingDetails['contact'] && !$mappingDetails['potential'])) {
$deleteMappingsList[] = $mappingId; $deleteMappingsList[] = $mappingId;
......
modules/Settings/Leads/models/Module.php
+ 1
− 1
View file @ c32dc6c5
...@@ -33,7 +33,7 @@ class Settings_Leads_Module_Model extends Vtiger_Module_Model { ...@@ -33,7 +33,7 @@ class Settings_Leads_Module_Model extends Vtiger_Module_Model {
* @return <Array> list of field ids * @return <Array> list of field ids
*/ */
public function getMappingSupportedFieldIdsList() { public function getMappingSupportedFieldIdsList() {
if (!$this->supportedFieldIdsList) { if (!property_exists($this,'supportedFieldIdsList') || !$this->supportedFieldIdsList) {
$selectedTabidsList[] = getTabid($this->getName()); $selectedTabidsList[] = getTabid($this->getName());
$restrictedFieldNames = array('campaignrelstatus'); $restrictedFieldNames = array('campaignrelstatus');
$restrictedUitypes = $this->getRestrictedUitypes(); $restrictedUitypes = $this->getRestrictedUitypes();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Copyright 2023 Vtiger. All rights reserved.