Changeset 13043

Timestamp:

03/12/10 10:17:33 (5 months ago)

Author:

musavir

Message:

Campaigns-Accounts relationship - Sripriya
==========================================

1. added relationship b/w Accounts and Campaigns module.

Files:

• vtigercrm/branches/5.2.0/Smarty/templates/RelatedListDataContents.tpl (modified) (3 diffs)
• vtigercrm/branches/5.2.0/Smarty/templates/RelatedLists.tpl (modified) (4 diffs)
• vtigercrm/branches/5.2.0/include/js/ListView.js (modified) (1 diff)
• vtigercrm/branches/5.2.0/include/utils/ListViewUtils.php (modified) (1 diff)
• vtigercrm/branches/5.2.0/modules/Campaigns/Campaigns.php (modified) (10 diffs)
• vtigercrm/branches/5.2.0/modules/Campaigns/language/en_us.lang.php (modified) (1 diff)
• vtigercrm/branches/5.2.0/modules/Leads/LeadConvertToEntities.php (modified) (3 diffs)

vtigercrm/branches/5.2.0/Smarty/templates/RelatedListDataContents.tpl

@@ -15 +15 @@
-                        {$RELATEDLISTDATA.navigation.0}
-                        {if $MODULE eq 'Campaigns' && ($RELATED_MODULE eq 'Contacts' || $RELATED_MODULE eq 
-
+ || $RELATED_MODULE eq 'Accounts'
-                                <br>{$APP.LBL_SELECT_BUTTON_LABEL}: <a href="javascript:void(0);"
-                                        onclick="clear_checked_all('{$RELATED_MODULE}');">{$APP.LBL_NONE_NO_LINE}</a>
@@ -40 +40 @@
-<table border=0 cellspacing=1 cellpadding=3 width=100% style="background-color:#eaeaea;" class="small">
-        <tr style="height:25px" bgcolor=white>
-
+ || $RELATED_MODULE eq 'Accounts'
-                        && $RELATEDLISTDATA.entries|@count > 0}
-                <td class="lvtCol">
@@ -52 +52 @@
-        {foreach key=_RECORD_ID item=_RECORD from=$RELATEDLISTDATA.entries}
-                <tr bgcolor=white>
-
+ || $RELATED_MODULE eq 'Accounts'
-                        <td><input name="{$RELATED_MODULE}_selected_id" id="{$_RECORD_ID}" value="{$_RECORD_ID}" onclick="rel_check_object(this,'{$RELATED_MODULE}');" type="checkbox"  {$check_status.checked.$header}></td>
-                {/if}

vtigercrm/branches/5.2.0/Smarty/templates/RelatedLists.tpl

@@ -16 +16 @@
-{literal}
-<script>
+
-function editProductListPrice(id,pbid,price)
-{
@@ -44 +45 @@
-                                onComplete: function(response) {
-                                        $("status").style.display="none";
-
+                                       
-                                }
-                        }
@@ -50 +51 @@
-}
-{/literal}
-
-function loadCvList(type,id)
-{ldelim}
-        if(type == 'Leads' && $("lead_cv_list").value != 'None') 
-        {ldelim}
-                $("status").style.display="inline"; 
-                new Ajax.Request(
-            'index.php',
-            {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
-                    method: 'post',
-                    postBody: 'module=Campaigns&action=CampaignsAjax&file=LoadList&ajax=true&return_action=DetailView&return_id='+id+'&list_type='+type+'&cvid='+$("lead_cv_list").value,
-                    onComplete: function(response) {ldelim}
-                            $("status").style.display="none";
-                            $("RLContents").update(response.responseText);
-                    {rdelim}
-            {rdelim}
-                );
-        {rdelim}
-
-     if(type == 'Contacts' && $("cont_cv_list").value != 'None') 
-        {ldelim}
-                $("status").style.display="inline";
-        new Ajax.Request(
-                'index.php',
-                {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
-                        method: 'post',
-                        postBody: 'module=Campaigns&action=CampaignsAjax&file=LoadList&ajax=true&return_action=DetailView&return_id='+id+'&list_type='+type+'&cvid='+$("cont_cv_list").value,
-                        onComplete: function(response) {ldelim}
-                                $("status").style.display="none";
-                                $("RLContents").update(response.responseText);
-                        {rdelim}
-                {rdelim}
-                );
-        {rdelim}
-{rdelim}
-</script>
-        {include file='Buttons_List1.tpl'}
@@ -98 +64 @@
-                         <span class="lvtHeaderText"><font color="purple">[ {$MOD_SEQ_ID} ] </font>{$NAME} -  {$SINGLE_MOD} {$APP.LBL_MORE} {$APP.LBL_INFORMATION}</span> <br>
-                         {$UPDATEINFO}
+                         </span>&nbsp;&nbsp;<span id="vtbusy_info" style="display:none;" valign="bottom"><img src="{$IMAGE_PATH}vtbusy.gif" border="0"></span><span id="vtbusy_info" style="visibility:hidden;" valign="bottom"><img src="{$IMAGE_PATH}vtbusy.gif" border="0"></span>
+
-                         <hr noshade size=1>
-                         <br> 

vtigercrm/branches/5.2.0/include/js/ListView.js

@@ -506 +506 @@
-        return true;
-}
+var statusPopupTimer = null;
+function closeStatusPopup(elementid)
+{
+        statusPopupTimer = setTimeout("document.getElementById('" + elementid + "').style.display = 'none';", 50);
+}
+
+function updateCampaignRelationStatus(relatedmodule, campaignid, crmid, campaignrelstatusid, campaignrelstatus)
+{
+        $("vtbusy_info").style.display="inline";
+        document.getElementById('campaignstatus_popup_' + crmid).style.display = 'none';
+        var data = "action=updateRelationsAjax&module=Campaigns&relatedmodule=" + relatedmodule + "&campaignid=" + campaignid + "&crmid=" + crmid + "&campaignrelstatusid=" + campaignrelstatusid;
+        new Ajax.Request(
+                'index.php',
+                        {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: data,
+                        onComplete: function(response) {
+                                if(response.responseText.indexOf(":#:FAILURE")>-1)
+                                {
+                                        alert(alert_arr.ERROR_WHILE_EDITING);
+                                }
+                                else if(response.responseText.indexOf(":#:SUCCESS")>-1)
+                                {
+                                        document.getElementById('campaignstatus_' + crmid).innerHTML = campaignrelstatus;
+                                        $("vtbusy_info").style.display="none";
+                                }
+                        }
+                }
+        );
+}
+
+function loadCvList(type,id) {
+        var element = type+"_cv_list";
+        var value = document.getElementById(element).value;        
+
+        if(value != '') {
+                $("status").style.display="inline";
+                new Ajax.Request(
+                        'index.php',
+                        {queue: {position: 'end', scope: 'command'},
+                                method: 'post',
+                                postBody: 'module=Campaigns&action=CampaignsAjax&file=LoadList&ajax=true&return_action=DetailView&return_id='+id+'&list_type='+type+'&cvid='+value,
+                                onComplete: function(response) {
+                                        $("status").style.display="none";
+                                        $("RLContents").update(response.responseText);
+                                }
+                        }
+                );
+        }
+}

vtigercrm/branches/5.2.0/include/utils/ListViewUtils.php

@@ -1537 +1537 @@
-                }
-        }
+        elseif ($uitype == 16)
+        {
+                $value = getTranslatedString($temp_val,$currentModule);
+        }
-        elseif($uitype == 71 || $uitype == 72)
-        {

vtigercrm/branches/5.2.0/modules/Campaigns/Campaigns.php

@@ -131 +131 @@
-
-        /**
+         * Function to get Campaign related Accouts
+         * @param  integer   $id      - campaignid
+         * returns related Accounts record in array format
+         */
+        function get_accounts($id, $cur_tab_id, $rel_tab_id, $actions = false) {
+                global $log, $singlepane_view,$currentModule;
+                $log->debug("Entering get_accounts(".$id.") method ...");
+                $this_module = $currentModule;
+
+                $related_module = vtlib_getModuleNameById($rel_tab_id);
+                require_once("modules/$related_module/$related_module.php");
+                $other = new $related_module();
+                
+                $is_CampaignStatusAllowed = false;
+                global $current_user;
+                if(getFieldVisibilityPermission('Accounts', $current_user->id, 'campaignrelstatus') == '0') {
+                        $other->list_fields['Status'] = array('vtiger_campaignrelstatus'=>'campaignrelstatus');
+                        $other->list_fields_name['Status'] = 'campaignrelstatus';
+                        $other->sortby_fields[] = 'campaignrelstatus';
+                        $is_CampaignStatusAllowed = true;
+                }
+
+                vtlib_setup_modulevars($related_module, $other);
+                $singular_modname = vtlib_toSingular($related_module);
+
+                $parenttab = getParentTab();
+
+                if($singlepane_view == 'true')
+                        $returnset = '&return_module='.$this_module.'&return_action=DetailView&return_id='.$id;
+                else
+                        $returnset = '&return_module='.$this_module.'&return_action=CallRelatedList&return_id='.$id;
+
+                $button = '';
+
+                // Send mail button for selected Accounts
+                $button .= "<input title='".getTranslatedString('LBL_SEND_MAIL_BUTTON')."' class='crmbutton small edit' value='".getTranslatedString('LBL_SEND_MAIL_BUTTON')."' type='button' name='button' onclick='rel_eMail(\"$this_module\",this,\"$related_module\")'>";
+                $button .= '&nbsp;&nbsp;&nbsp;&nbsp';
+                /* To get Accounts CustomView -START */
+                require_once('modules/CustomView/CustomView.php');
+                $ahtml = "<select id='".$related_module."_cv_list' class='small'><option value='None'>-- ".getTranslatedString('Select One')." --</option>";
+                $oCustomView = new CustomView($related_module);
+                $viewid = $oCustomView->getViewId($related_module);
+                $customviewcombo_html = $oCustomView->getCustomViewCombo($viewid, false);
+                $ahtml .= $customviewcombo_html;
+                $ahtml .= "</select>";
+                /* To get Accounts CustomView -END */
+
+                $button .= $ahtml."<input title='".getTranslatedString('LBL_LOAD_LIST',$this_module)."' class='crmbutton small edit' value='".getTranslatedString('LBL_LOAD_LIST',$this_module)."' type='button' name='button' onclick='loadCvList(\"$related_module\",\"$id\")'>";
+                $button .= '&nbsp;&nbsp;&nbsp;&nbsp';
+
+                if($actions)
+                {
+                        if(is_string($actions))
+                                $actions = explode(',', strtoupper($actions));
+                        if(in_array('SELECT', $actions) && isPermitted($related_module,4, '') == 'yes')
+                        {
+                                $button .= "<input title='".getTranslatedString('LBL_SELECT')." ". getTranslatedString($related_module). "' class='crmbutton small edit' type='button' onclick=\"return window.open('index.php?module=$related_module&return_module=$currentModule&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid=$id&parenttab=$parenttab','test','width=640,height=602,resizable=0,scrollbars=0');\" value='". getTranslatedString('LBL_SELECT'). " " . getTranslatedString($related_module) ."'>&nbsp;";
+                        }
+                        if(in_array('ADD', $actions) && isPermitted($related_module,1, '') == 'yes')
+                        {
+                                $button .= "<input title='".getTranslatedString('LBL_ADD_NEW'). " ". getTranslatedString($singular_modname) ."' class='crmbutton small create'" .
+                                        " onclick='this.form.action.value=\"EditView\";this.form.module.value=\"$related_module\"' type='submit' name='button'" .
+                                        " value='". getTranslatedString('LBL_ADD_NEW'). " " . getTranslatedString($singular_modname) ."'>&nbsp;";
+                        }
+                }
+
+                $query = "SELECT vtiger_account.*,
+                                CASE when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,
+                                vtiger_crmentity.*, vtiger_crmentity.modifiedtime, vtiger_campaignrelstatus.*, vtiger_accountbillads.*
+                                FROM vtiger_account
+                                INNER JOIN vtiger_campaignaccountrel ON vtiger_campaignaccountrel.accountid = vtiger_account.accountid
+                                INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid = vtiger_account.accountid
+                                LEFT JOIN vtiger_groups ON vtiger_groups.groupid=vtiger_crmentity.smownerid
+                                LEFT JOIN vtiger_users ON vtiger_crmentity.smownerid=vtiger_users.id
+                                LEFT JOIN vtiger_accountbillads ON vtiger_accountbillads.accountaddressid = vtiger_account.accountid
+                                LEFT JOIN vtiger_campaignrelstatus ON vtiger_campaignrelstatus.campaignrelstatusid = vtiger_campaignaccountrel.campaignrelstatusid
+                                WHERE vtiger_campaignaccountrel.campaignid = ".$id." AND vtiger_crmentity.deleted=0";
+
+                $return_value = GetRelatedList($this_module, $related_module, $other, $query, $button, $returnset);
+                
+                if($return_value == null)
+                        $return_value = Array();
+                else if($is_CampaignStatusAllowed) {
+                        $statusPos = count($return_value['header']) - 2; // Last column is for Actions, exclude that. Also the index starts from 0, so reduce one more count.
+                        $return_value = $this->add_status_popup($return_value, $statusPos, 'Accounts');
+                }
+                        
+                $return_value['CUSTOM_BUTTON'] = $button;
+
+                $log->debug("Exiting get_accounts method ...");
+                return $return_value;
+        }
+
+        /**
-         * Function to get Campaign related Contacts
-         * @param  integer   $id      - campaignid
@@ -143 +237 @@
-                require_once("modules/$related_module/$related_module.php");
-                $other = new $related_module();
-
+
+
+
+
+
+
+
+
+
+
+
-                $singular_modname = vtlib_toSingular($related_module);
-                
@@ -161 +265 @@
-                /* To get Leads CustomView -START */
-                require_once('modules/CustomView/CustomView.php');
-cont
+".$related_module."
-                $oCustomView = new CustomView($related_module);
-                $viewid = $oCustomView->getViewId($related_module);
@@ -185 +289 @@
-
-                $query = "SELECT vtiger_contactdetails.accountid, vtiger_account.accountname, 
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                                        
-                $return_value = GetRelatedList($this_module, $related_module, $other, $query, $button, $returnset); 
-                
-
+
+
+
+
+
+
+
-                $return_value['CUSTOM_BUTTON'] = $button;
-                
@@ -219 +330 @@
-                require_once("modules/$related_module/$related_module.php");
-                $other = new $related_module();
-
+
+
+
+
+
+
+
+
+
+
+
-                $singular_modname = vtlib_toSingular($related_module);
-                
@@ -237 +358 @@
-                /* To get Leads CustomView -START */
-                require_once('modules/CustomView/CustomView.php');
-lead
+".$related_module."
-                $oCustomView = new CustomView($related_module);
-                $viewid = $oCustomView->getViewId($related_module);
@@ -261 +382 @@
-
-                $query = "SELECT vtiger_leaddetails.*, vtiger_crmentity.crmid,vtiger_leadaddress.phone,vtiger_leadsubdetails.website, 
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                                        
-                $return_value = GetRelatedList($this_module, $related_module, $other, $query, $button, $returnset); 
-                
-
+
+
+
+
+
+
+
-                $return_value['CUSTOM_BUTTON'] = $button;
-                
@@ -411 +540 @@
-        
-        }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        /*
-         * Function to get the secondary query part of a report 
@@ -438 +600 @@
-                        "Contacts" => array("vtiger_campaigncontrel"=>array("campaignid","contactid"),"vtiger_campaign"=>"campaignid"),
-                        "Leads" => array("vtiger_campaignleadrel"=>array("campaignid","leadid"),"vtiger_campaign"=>"campaignid"),
+                        "Accounts" => array("vtiger_campaignaccountrel"=>array("campaignid","accountid"),"vtiger_campaign"=>"campaignid"),
-                        "Potentials" => array("vtiger_potential"=>array("campaignid","potentialid"),"vtiger_campaign"=>"campaignid"),
-                        "Calendar" => array("vtiger_seactivityrel"=>array("crmid","activityid"),"vtiger_campaign"=>"campaignid"),
@@ -456 +619 @@
-                        $sql = 'DELETE FROM vtiger_campaigncontrel WHERE campaignid=? AND contactid=?';
-                        $this->db->pquery($sql, array($id, $return_id));
+                } elseif($return_module == 'Accounts') {
+                        $sql = 'DELETE FROM vtiger_campaignaccountrel WHERE campaignid=? AND accountid=?';
+                        $this->db->pquery($sql, array($id, $return_id));
-                } else {
-                        $sql = 'DELETE FROM vtiger_crmentityrel WHERE (crmid=? AND relmodule=? AND relcrmid=?) OR (relcrmid=? AND module=? AND crmid=?)';

vtigercrm/branches/5.2.0/modules/Campaigns/language/en_us.lang.php

@@ -85 +85 @@
-//Module Sequence Numbering
-'Campaign No'=>'Campaign No',
+// status fields 
+'--None--'=>'--None--',
+'Contacted - Successful' => 'Contacted - Successful',
+'Contacted - Unsuccessful' => 'Contacted - Unsuccessful',
+'Contacted - Never Contact Again' => 'Contacted - Never Contact Again'
-// END
-

vtigercrm/branches/5.2.0/modules/Leads/LeadConvertToEntities.php

@@ -327 +327 @@
-                $campaignid = $adb->query_result($campaign_result,$i,'campaignid');
-
-) values(?,?
-
+, campaignrelstatusid) values(?,?,1
+       
-        $log->debug("Exit from function saveLeadRelatedCampaigns.");
+}
+function saveLeadConvertedAccounts($leadid,$relatedid){
+        global $adb, $log;
+        $log->debug("Entering into function saveLeadConvertedAccounts($leadid, $relatedid)");
+        $campaign_result = $adb->pquery("select * from vtiger_campaignleadrel where leadid=?", array($leadid));
+        $noofcampaigns = $adb->num_rows($campaign_result);
+        for($i = 0; $i < $noofcampaigns; $i++)
+        {
+                $campaignid = $adb->query_result($campaign_result,$i,'campaignid');
+                $adb->pquery("INSERT INTO vtiger_campaignaccountrel (campaignid, accountid, campaignrelstatusid) values(?,?,1)",array($campaignid,$relatedid));
+                
+        }
+        $log->debug("Exit from function saveLeadConvertedAccounts.");
-}
-$crmid ='';
@@ -339 +352 @@
-        if($acc_rows != 0){
-                $crmid = $adb->query_result($acc_res,0,"accountid");
-        
-                //Retrieve the lead related products and relate them with this new account
-                getRelatedNotesAttachments($id,$crmid); 
-                saveLeadRelatedProducts($id, $crmid, "Accounts");
-                saveLeadRelations($id, $crmid, "Accounts");
+                $accountid=$crmid;
+                saveLeadConvertedAccounts($id,$accountid);
+
-        } else if($accountname==''){
-                $crmid='';
-        } else
-
+ 
-                $crmid = $adb->getUniqueID("vtiger_crmentity");
-        
@@ -403 +418 @@
-                saveLeadRelatedProducts($id, $crmid, "Accounts");
-                saveLeadRelations($id, $crmid, "Accounts");
+                $accountid = $crmid;
+                //Retrieve the lead related Campaigns and relate them with this new Account
+                saveLeadConvertedAccounts($id, $accountid);
-        }
-}