From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 25 Feb 2014 15:53:31 +0000 (-0500)
Subject: CRM-13966 - Refactor autocomplete from financial acct form
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=253baf654d7f5bcaf854d07edc4b6d4de8467700;p=civicrm-core.git

CRM-13966 - Refactor autocomplete from financial acct form
---

diff --git a/CRM/Financial/Form/FinancialAccount.php b/CRM/Financial/Form/FinancialAccount.php
index 84d60c285f..923f0e0d3e 100644
--- a/CRM/Financial/Form/FinancialAccount.php
+++ b/CRM/Financial/Form/FinancialAccount.php
@@ -87,9 +87,6 @@ class CRM_Financial_Form_FinancialAccount extends CRM_Contribute_Form {
    */
   public function buildQuickForm( ) {
     parent::buildQuickForm( );
-    $dataURL = CRM_Utils_System::url('civicrm/ajax/rest',
-      'className=CRM_Contact_Page_AJAX&fnName=getContactList&json=1&context=contact&org=1', FALSE, NULL, FALSE);
-    $this->assign('dataURL', $dataURL);
 
     if ($this->_action & CRM_Core_Action::DELETE) {
       return;
@@ -104,8 +101,7 @@ class CRM_Financial_Form_FinancialAccount extends CRM_Contribute_Form {
     $this->add('text', 'description', ts('Description'), $attributes['description']);
     $this->add('text', 'accounting_code', ts('Accounting Code'), $attributes['accounting_code']);
     $elementAccounting = $this->add('text', 'account_type_code', ts('Account Type Code'), $attributes['account_type_code']);
-    $this->add('text', 'contact_name', ts('Owner'), $attributes['name']);
-    $this->add('hidden', 'contact_id', '', array('id' => 'contact_id'));
+    $this->addEntityRef('contact_id', ts('Owner'), array('api' => array('params' => array('contact_type' => 'Organization')), 'create' => TRUE));
     $this->add('text', 'tax_rate', ts('Tax Rate'), $attributes['tax_rate']);
     $this->add('checkbox', 'is_deductible', ts('Tax-Deductible?'));
     $elementActive = $this->add('checkbox', 'is_active', ts('Enabled?'));
@@ -166,7 +162,6 @@ class CRM_Financial_Form_FinancialAccount extends CRM_Contribute_Form {
     $defaults = parent::setDefaultValues();
     if ($this->_action & CRM_Core_Action::ADD) {
       $defaults['contact_id'] = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_Domain', CRM_Core_Config::domainID(), 'contact_id');
-      $defaults['contact_name'] = CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_Contact', $defaults['contact_id'], 'sort_name');
     }
     return $defaults;
   }
@@ -196,5 +191,3 @@ class CRM_Financial_Form_FinancialAccount extends CRM_Contribute_Form {
     }
   }
 }
-
-
diff --git a/templates/CRM/Financial/Form/FinancialAccount.tpl b/templates/CRM/Financial/Form/FinancialAccount.tpl
index 1defdc6d69..e4d06183a9 100644
--- a/templates/CRM/Financial/Form/FinancialAccount.tpl
+++ b/templates/CRM/Financial/Form/FinancialAccount.tpl
@@ -43,8 +43,8 @@
       <td class="html-adjust">{$form.description.html}</td>
     </tr>
     <tr class="crm-contribution-form-block-organisation_name">
-      <td class="label">{$form.contact_name.label}&nbsp;{help id="id-financial-owner" file="CRM/Contact/Form/Contact.hlp"}</td>
-      <td class="html-adjust">{$form.contact_name.html|crmReplace:class:twenty}<br />
+      <td class="label">{$form.contact_id.label}&nbsp;{help id="id-financial-owner" file="CRM/Contact/Form/Contact.hlp"}</td>
+      <td class="html-adjust">{$form.contact_id.html}<br />
         <span class="description">{ts}Use this field to indicate the organization that owns this account.{/ts}</span>
       </td>
     </tr>
@@ -96,43 +96,3 @@
 {/if}
   <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="botttom"}</div>
 </div>
-
-{literal}
-<script type="text/javascript">
-var dataUrl        = "{/literal}{$dataURL}{literal}";
-cj('#contact_name').autocomplete( dataUrl, {
-  width        : 250,
-  selectFirst  : false,
-  matchCase    : true,
-  matchContains: true,
-  max: {/literal}{crmSetting name="search_autocomplete_count" group="Search Preferences"}{literal}
-}).result( function(event, data, formatted) {
-  ( parseInt( data[1] ) ) ? cj( "#contact_id" ).val( data[1] ) : cj( "#contact_id" ).val('');
-});
-
-// remove current account owner id when current owner removed.
-cj("form").submit(function() {
-  if (!cj('#contact_name').val()) cj( "#contact_id" ).val('');
-});
-
-//current employer default setting
-var employerId = "{/literal}{$organisationId}{literal}";
-if ( employerId ) {
-  var dataUrl = "{/literal}{crmURL p='civicrm/ajax/rest' h=0 q="className=CRM_Contact_Page_AJAX&fnName=getContactList&json=1&context=contact&org=1&id=" }{literal}" + employerId ;
-  cj.ajax({
-    url     : dataUrl,
-    async   : false,
-    success : function(html){
-      //fixme for showing address in div
-      htmlText = html.split( '|' , 2);
-      cj('input#contact_name').val(htmlText[0]);
-      cj('input#contact_id').val(htmlText[1]);
-    }
-  });
-}
-
-cj("input#contact_name").click( function( ) {
-  cj("input#contact_id").val('');
-});
-</script>
-{/literal}