From fb8498abc056c12934abd006c998bcd2b97f8a86 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 17 Sep 2014 18:41:06 +0100 Subject: [PATCH] Changed linked entity table for fee and registration --- CRM/Event/BAO/Event.php | 37 +++++++++---------- .../Form/ManageEvent/ConfirmRepeatMode.tpl | 4 +- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/CRM/Event/BAO/Event.php b/CRM/Event/BAO/Event.php index 0b9bf753eb..375debdc75 100644 --- a/CRM/Event/BAO/Event.php +++ b/CRM/Event/BAO/Event.php @@ -2212,26 +2212,25 @@ LEFT JOIN civicrm_price_field_value value ON ( value.id = lineItem.price_field $result = array(); if( $entityId && $linkedEntityTable ){ switch ($linkedEntityTable) { - case 'civicrm_tell_friend': - $dao = 'CRM_Friend_DAO_Friend'; - $entityTable = 'civicrm_tell_friend'; - break; + case 'civicrm_tell_friend': + $dao = 'CRM_Friend_DAO_Friend'; + $entityTable = 'civicrm_tell_friend'; + break; - case 'civicrm_pcp_block': - $dao = 'CRM_PCP_DAO_PCPBlock'; - $entityTable = 'civicrm_pcp_block'; - break; - - case 'civicrm_price_set_entity': - $dao = 'CRM_Price_DAO_PriceSetEntity'; - $entityTable = 'civicrm_price_set_entity'; - break; - - case 'civicrm_uf_join': - $dao = 'CRM_Core_DAO_UFJoin'; - $entityTable = 'civicrm_uf_join'; - break; - + case 'civicrm_pcp_block': + $dao = 'CRM_PCP_DAO_PCPBlock'; + $entityTable = 'civicrm_pcp_block'; + break; + + case 'civicrm_price_set_entity': + $dao = 'CRM_Price_DAO_PriceSetEntity'; + $entityTable = 'civicrm_price_set_entity'; + break; + + case 'civicrm_uf_join': + $dao = 'CRM_Core_DAO_UFJoin'; + $entityTable = 'civicrm_uf_join'; + break; } $params = array( 'entity_id' => $entityId, diff --git a/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl b/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl index 84a3a9425e..3149c13581 100644 --- a/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl +++ b/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl @@ -71,8 +71,8 @@ //Tab and table mapper var mapper = {'CRM_Event_Form_ManageEvent_EventInfo': '', 'CRM_Event_Form_ManageEvent_Location': '', - 'CRM_Event_Form_ManageEvent_Fee': 'civicrm_price_set_entity', - 'CRM_Event_Form_ManageEvent_Registration': 'civicrm_uf_join', + 'CRM_Event_Form_ManageEvent_Fee': '', + 'CRM_Event_Form_ManageEvent_Registration': '', 'CRM_Friend_Form_Event': 'civicrm_tell_friend', 'CRM_PCP_Form_Event': 'civicrm_pcp_block' }; -- 2.25.1