unset($params['autocompleteContactReference']);
}
- // save components to be enabled
+ // save components to be enabled
if (CRM_Utils_Array::value('enableComponents', $params)) {
CRM_Core_BAO_Setting::setItem($params['enableComponents'],
CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,'enable_components');
$value = $row[$element];
// hack to fix date field display format
if (strpos($element, '_date')) {
- $value = CRM_Utils_Date::customFormat($value, "%e %b");
+ $value = CRM_Utils_Date::customFormat($value, "%B %E%f");
}
}
$badgeInfo = CRM_Badge_BAO_Layout::create($params);
if (isset($params['_qf_Layout_refresh'])) {
+ $this->set('id', $badgeInfo->id);
$params['badge_id'] = $badgeInfo->id;
self::buildPreview($params);
}
// get a max participant id
$participantID = CRM_Core_DAO::singleValueQuery('select max(id) from civicrm_participant');
+ if (!$participantID) {
+ CRM_Core_Session::setStatus(ts('Preview requires at least one event and one participant record.
+ If you are just getting started, you can add a test participant record.'), ts('Preview Requirements'), 'alert');
+ return;
+ }
+
$this->_single = TRUE;
$this->_participantIds = array($participantID);
$this->_componentClause = " civicrm_participant.id = $participantID ";
}
$this->setDefaults($this->_defaults);
-
+
// add in all state country selectors for enabled countries
CRM_Core_BAO_Address::fixAllStateSelects($this, $this->_defaults);
}
*/
function buildCustom($id, $name, $viewOnly = FALSE) {
- // create state country map array to hold selectors
+ // create state country map array to hold selectors
$stateCountryMap = array();
if ($id) {
// ignore file upload fields
continue;
}
-
- // if state or country in the profile, create map
+
+ // if state or country in the profile, create map
list($prefixName, $index) = CRM_Utils_System::explode('-', $key, 2);
if ($prefixName == 'state_province' || $prefixName == 'country' || $prefixName == 'county') {
if (!array_key_exists($index, $stateCountryMap)) {
$stateCountryMap[$index] = array();
}
$stateCountryMap[$index][$prefixName] = $key;
- }
+ }
CRM_Core_BAO_UFGroup::buildProfile($this, $field, CRM_Profile_Form::MODE_CREATE, $contactID, TRUE);
$this->_fields[$key] = $field;
}
}
- // initialize the state country map
+ // initialize the state country map
CRM_Core_BAO_Address::addStateCountryMap($stateCountryMap);
if ($addCaptcha &&
// create current employer
if (isset($params['employer_id'])) {
CRM_Contact_BAO_Contact_Utils::createCurrentEmployerRelationship($contact->id,
- $params['employer_id']
+ $params['employer_id'], $employerId
);
}
elseif ($params['current_employer']) {
) {
return FALSE;
}
-
+
// CRM-12929
// Restrict contact to be delete if contact has financial trxns
$error = NULL;
and seconddegbb.is_permission_a_b = 1
and firstdeg.is_permission_a_b = 1
and seconddegbb.is_active = 1
-WHERE
+WHERE
(
- ( firstdeg.contact_id_a = %1 AND firstdeg.contact_id_b = %2 AND firstdeg.is_permission_a_b = 1 )
+ ( firstdeg.contact_id_a = %1 AND firstdeg.contact_id_b = %2 AND firstdeg.is_permission_a_b = 1 )
OR ( firstdeg.contact_id_a = %2 AND firstdeg.contact_id_b = %1 AND firstdeg.is_permission_b_a = 1 )
- OR (
+ OR (
firstdeg.contact_id_a = %1 AND seconddegba.contact_id_a = %2
- AND (seconddegba.contact_id_a NOT IN (SELECT id FROM civicrm_contact WHERE is_deleted = 1))
+ AND (seconddegba.contact_id_a NOT IN (SELECT id FROM civicrm_contact WHERE is_deleted = 1))
)
- OR (
+ OR (
firstdeg.contact_id_a = %1 AND seconddegbb.contact_id_b = %2
- AND (seconddegbb.contact_id_b NOT IN (SELECT id FROM civicrm_contact WHERE is_deleted = 1))
+ AND (seconddegbb.contact_id_b NOT IN (SELECT id FROM civicrm_contact WHERE is_deleted = 1))
)
- OR (
+ OR (
firstdeg.contact_id_b = %1 AND seconddegab.contact_id_b = %2
- AND (seconddegab.contact_id_b NOT IN (SELECT id FROM civicrm_contact WHERE is_deleted = 1))
+ AND (seconddegab.contact_id_b NOT IN (SELECT id FROM civicrm_contact WHERE is_deleted = 1))
)
- OR (
- firstdeg.contact_id_b = %1 AND seconddegaa.contact_id_a = %2 AND (seconddegaa.contact_id_a NOT IN (SELECT id FROM civicrm_contact WHERE is_deleted = 1))
+ OR (
+ firstdeg.contact_id_b = %1 AND seconddegaa.contact_id_a = %2 AND (seconddegaa.contact_id_a NOT IN (SELECT id FROM civicrm_contact WHERE is_deleted = 1))
)
- )
- AND (firstdeg.contact_id_a NOT IN (SELECT id FROM civicrm_contact WHERE is_deleted = 1))
+ )
+ AND (firstdeg.contact_id_a NOT IN (SELECT id FROM civicrm_contact WHERE is_deleted = 1))
AND (firstdeg.contact_id_b NOT IN (SELECT id FROM civicrm_contact WHERE is_deleted = 1))
AND ( firstdeg.is_active = 1)
";
* @access public
* @static
*/
- static function createCurrentEmployerRelationship($contactID, $organization) {
+ static function createCurrentEmployerRelationship($contactID, $organization, $previousEmployerID = NULL) {
$organizationId = NULL;
// if organization id is passed.
}
}
- $previousEmployerID = CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_Contact', $contactID, 'employer_id');
- if ($organizationId && $organizationId != $previousEmployerID) {
+ if ($organizationId) {
$cid = array('contact' => $contactID);
// get the relationship type id of "Employee of"
// In case we change employer, clean prveovious employer related records.
+ if (!$previousEmployerID) {
+ $previousEmployerID = CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_Contact', $contactID, 'employer_id');
+ }
if ($previousEmployerID &&
$previousEmployerID != $organizationId
) {
$relationshipParams['relationship_ids'] = $relationshipIds;
// handle related meberships. CRM-3792
- self::currentEmployerRelatedMembership($contactID, $organizationId, $relationshipParams, $duplicate);
+ self::currentEmployerRelatedMembership($contactID, $organizationId, $relationshipParams, $duplicate, $previousEmployerID);
}
}
* @access public
* @static
*/
- static function currentEmployerRelatedMembership($contactID, $employerID, $relationshipParams, $duplicate = FALSE) {
+ static function currentEmployerRelatedMembership($contactID, $employerID, $relationshipParams, $duplicate = FALSE, $previousEmpID = NULL) {
$ids = array();
$action = CRM_Core_Action::ADD;
}
//need to handle related meberships. CRM-3792
- CRM_Contact_BAO_Relationship::relatedMemberships($contactID, $relationshipParams, $ids, $action);
+ if ($previousEmpID != $employerID) {
+ CRM_Contact_BAO_Relationship::relatedMemberships($contactID, $relationshipParams, $ids, $action);
+ }
}
/**
return;
}
+ // skip for hook injected fields / params
+ $extFields = CRM_Contact_BAO_Query_Hook::singleton()->getFields();
+ if (array_key_exists($values[0], $extFields)) {
+ return;
+ }
+
switch ($values[0]) {
case 'deleted_contacts':
$this->deletedContacts($values);
// to handle table dependencies of components
CRM_Core_Component::tableNames($tables);
+ // to handle table dependencies of hook injected tables
+ CRM_Contact_BAO_Query_Hook::singleton()->setTableDependency($tables);
//format the table list according to the weight
$info = CRM_Core_TableHierarchy::info();
* Delegate query functions based on hook system
*/
class CRM_Contact_BAO_Query_Hook {
-
+
/**
* @var array of CRM_Contact_BAO_Query_Interface objects
*/
}
return $this->_queryObjects;
}
-
+
public function &getFields() {
$extFields = array();
foreach (self::getSearchQueryObjects() as $obj) {
}
return $extFields;
}
-
+
public function alterSearchQuery(&$query, $fnName) {
foreach (self::getSearchQueryObjects() as $obj) {
$obj->$fnName($query);
}
}
-
+
public function buildSearchfrom($fieldName, $mode, $side) {
$from = '';
foreach (self::getSearchQueryObjects() as $obj) {
}
return $from;
}
+
+ public function setTableDependency(&$tables) {
+ foreach (self::getSearchQueryObjects() as $obj) {
+ $obj->setTableDependency($tables);
+ }
+ }
+
+ public function registerAdvancedSearchPane(&$panes) {
+ foreach (self::getSearchQueryObjects() as $obj) {
+ $obj->registerAdvancedSearchPane($panes);
+ }
+ }
+
+ public function buildAdvancedSearchPaneForm(&$form, $type) {
+ foreach (self::getSearchQueryObjects() as $obj) {
+ $obj->buildAdvancedSearchPaneForm($form, $type);
+ }
+ }
+
+ public function setAdvancedSearchPaneTemplatePath(&$paneTemplatePathArray, $type) {
+ foreach (self::getSearchQueryObjects() as $obj) {
+ $obj->setAdvancedSearchPaneTemplatePath($paneTemplatePathArray, $type);
+ }
+ }
}
\ No newline at end of file
*/
/**
- * Interface for search BAO query objects
+ * Abstract class for search BAO query objects
*/
-interface CRM_Contact_BAO_Query_Interface {
+abstract class CRM_Contact_BAO_Query_Interface {
- public function &getFields();
+ abstract public function &getFields();
+ abstract public function from($fieldName, $mode, $side);
- public function select(&$query);
+ public function select(&$query) {
+ return NULL;
+ }
- public function where(&$query);
+ public function where(&$query) {
+ return NULL;
+ }
- public function from($fieldName, $mode, $side);
+ public function setTableDependency(&$tables) {
+ return NULL;
+ }
+
+ public function registerAdvancedSearchPane(&$panes) {
+ return NULL;
+ }
+
+ public function buildAdvancedSearchPaneForm(&$form, $type) {
+ return NULL;
+ }
+
+ public function setAdvancedSearchPaneTemplatePath(&$paneTemplatePathArray, $type) {
+ return NULL;
+ }
}
\ No newline at end of file
);
$stateID = CRM_Utils_Array::value('state_province_id',
$this->_defaults['address'][1]
- );
+ );
}
CRM_Contact_BAO_Contact_Utils::buildOnBehalfForm($this,
$this->_contactType,
$paneNames[$pane['title']] = $pane['name'];
}
- $this->_paneTemplatePath = array();
+ $hookPanes = array();
+ CRM_Contact_BAO_Query_Hook::singleton()->registerAdvancedSearchPane($hookPanes);
+ $paneNames = array_merge($paneNames, $hookPanes);
+ $this->_paneTemplatePath = array();
foreach ($paneNames as $name => $type) {
- if (!$this->_searchOptions[$type]) {
+ if (!array_key_exists($type, $this->_searchOptions) && !in_array($type, $hookPanes)) {
continue;
}
) {
$allPanes[$name]['open'] = 'true';
-
if (CRM_Utils_Array::value($type, $components)) {
$c = $components[$type];
$this->add('hidden', "hidden_$type", 1);
$c->buildAdvancedSearchPaneForm($this);
$this->_paneTemplatePath[$type] = $c->getAdvancedSearchPaneTemplatePath();
}
+ else if (in_array($type, $hookPanes)) {
+ CRM_Contact_BAO_Query_Hook::singleton()->buildAdvancedSearchPaneForm($this, $type);
+ CRM_Contact_BAO_Query_Hook::singleton()->setAdvancedSearchPaneTemplatePath($this->_paneTemplatePath, $type);
+ }
else {
CRM_Contact_Form_Search_Criteria::$type($this);
$template = ucfirst($type);
// Hack to add options not retrieved by getfields
// This list could go on and on, but it would be better to fix getfields
$options = array(
- 'group' => 'contact',
- 'tag' => 'contact',
- 'country' => 'contact',
- 'state_province' => 'contact',
+ 'group' => 'group_contact',
+ 'tag' => 'entity_tag',
+ 'country' => 'address',
+ 'state_province' => 'address',
'gender' => 'contact',
'world_region' => 'contact',
'individual_prefix' => 'contact',
else {
$this->addDefaultButtons($label, 'done');
}
-
+
$this->addFormRule(array('CRM_Contact_Form_Task_Delete', 'formRule'), $this);
}
// retrieve directory and url preferences also
CRM_Core_BAO_Setting::retrieveDirectoryAndURLPreferences($defaults);
- // Pickup enabled-components from settings table if found.
+ // Pickup enabled-components from settings table if found.
$enableComponents = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'enable_components', NULL, array());
if (!empty($enableComponents)) {
$defaults['enableComponents'] = $enableComponents;
-
+
$components = CRM_Core_Component::getComponents();
$enabledComponentIDs = array();
foreach ($defaults['enableComponents'] as $name) {
}
// get enabled-components from DB and add to the list
- $enabledComponents =
+ $enabledComponents =
CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'enable_components', NULL, array());
$enabledComponents[] = $componentName;
* Path to wkhtmltopdf if available
*/
public $wkhtmltopdfPath = FALSE;
-
+
/**
* Allow second-degree relations permission to edit contacts
*/
public $secondDegRelPermissions = FALSE;
-
+
/**
* Allow second-degree relations permission to edit contacts
return $permissionedEvents;
}
if (!empty($permissionedEvents)){
- return array_search($eventID, $permissionedEvents) === FALSE ? NULL : $eventID;
+ return array_search($eventID, $permissionedEvents) === FALSE ? NULL : $eventID;
} else {
return $eventID;
}
* @access public
*/
function check($str) {
- // Generic cms 'administer users' role tranlates to 'administrator' WordPress role
+ // Generic cms 'administer users' role tranlates to 'administrator' WordPress role
$str = $this->translatePermission($str, 'WordPress', array(
'administer users' => 'administrator',
));
/*
* Function to return a formatted list of relationship name.
* @param $list array array of relationship name.
- * @static
+ * @static
* return array array of relationship name.
*/
static function getFormattedList(&$list) {
return null;
}
}
-
+
/**
* check if contact is present in financial_item table
*
if (empty($contactIds)) {
return FALSE;
}
-
+
$allowPermDelete = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'allowPermDeleteFinancial');
if (!$allowPermDelete) {
$url = CRM_Utils_System::url('civicrm/contact/view', "reset=1&cid=$dao->id");
$not_deleted[$dao->id] = "<a href='$url'>$dao->display_name</a>";
}
-
+
$errorStatus = '';
if (is_array($error)) {
$errorStatus = '<ul><li>' . implode('</li><li>', $not_deleted) . '</li></ul>';
}
-
+
$error['_qf_default'] = $errorStatus . ts('This contact(s) can not be permanently deleted because the contact record is linked to one or more live financial transactions. Deleting this contact would result in the loss of financial data.');
- return $error;
+ return $error;
}
}
return FALSE;
break;
}
}
-
+
if ($check) {
if ($name[1] == 'PremiumsProduct' || $name[1] == 'Product') {
CRM_Core_Session::setStatus(ts('You cannot remove an account with a %1 relationship while the Financial Type is used for a Premium.', array(1 => $relationValues[$financialTypeAccountId])));
$replaceWith = array();
while($dao->fetch()){
$type = $this->getLogType($dao->log_type);
- if (!array_key_exists($type,$replaceWith))
+ if (!array_key_exists($type,$replaceWith))
$replaceWith[$type] = array();
$replaceWith[$type][] = $dao->log_type;
}
$replaceWith[$type] = implode("','", $tables);
}
}
-
+
$sql = "ALTER TABLE civicrm_temp_civireport_logsummary ADD COLUMN log_civicrm_entity_log_type_label varchar(64)";
CRM_Core_DAO::executeQuery($sql);
foreach ($replaceWith as $type => $in) {
'logging/contribute/summary',
);
+ //CRM-13028 / NYSS-6933 - table => array (cols) - to be excluded from the update statement
+ private $exceptions = array(
+ 'civicrm_job' => array('last_run'),
+ 'civicrm_group' => array('cache_date'),
+ );
+
/**
* Populate $this->tables and $this->logs with current db state.
*/
$cond = array( );
foreach ($columns as $column) {
// ignore modified_date changes
- if ($column != 'modified_date') {
+ if ($column != 'modified_date' && !in_array($column, CRM_Utils_Array::value($table, $this->exceptions, array()))) {
$cond[] = "IFNULL(OLD.$column,'') <> IFNULL(NEW.$column,'')";
}
}
foreach ($this->_fields as $name => $dontcare) {
$fields[$name] = 1;
}
-
+
CRM_Core_BAO_UFGroup::setProfileDefaults($this->_contactID, $fields, $this->_defaults);
}
$stateCountryMap = array();
while ($paymentsAffected->fetch()) {
$paymentIDs[] = $paymentsAffected->id;
}
- // Reset the affected values by the amount paid more than the scheduled amount
+ // Reset the affected values by the amount paid more than the scheduled amount
foreach($paymentIDs as $key => $value) {
$payment = new CRM_Pledge_DAO_PledgePayment();
$payment->id = $value;
$payment->save();
}
}
-
+
//Cancel the initial paid amount
CRM_Core_DAO::setFieldValue('CRM_Pledge_DAO_PledgePayment', reset($paymentIDs), 'status_id', $paymentStatusID, 'id');
CRM_Core_DAO::setFieldValue('CRM_Pledge_DAO_PledgePayment', reset($paymentIDs), 'actual_amount', $actualAmount, 'id');
-
+
//Add new payment after the last payment for the pledge
$allPayments = self::getPledgePayments($pledgeID);
$lastPayment = array_pop($allPayments);
// get the submitted form values.
$params = $this->controller->exportValues('Set');
$nameLength = CRM_Core_DAO::getAttribute('CRM_Price_DAO_PriceSet', 'name');
- $params['name'] = CRM_Utils_String::titleToVar($params['title'], CRM_Utils_Array::value('maxlength', $nameLength));
$params['is_active'] = CRM_Utils_Array::value('is_active', $params, FALSE);
$params['financial_type_id'] = CRM_Utils_Array::value('financial_type_id', $params, FALSE);
if ($this->_action & CRM_Core_Action::UPDATE) {
$params['id'] = $this->_sid;
}
+ else {
+ $params['name'] = CRM_Utils_String::titleToVar($params['title'],
+ CRM_Utils_Array::value('maxlength', $nameLength));
+ }
$set = CRM_Price_BAO_PriceSet::create($params);
if ($this->_action & CRM_Core_Action::UPDATE) {
$popupRedirect = CRM_Utils_System::url('civicrm/profile/edit', $urlParams, FALSE, NULL, FALSE);
}
elseif ($this->_onPopupClose == 'redirectToTab') {
- $popupRedirect = CRM_Utils_System::url('civicrm/contact/view',
+ $popupRedirect = CRM_Utils_System::url('civicrm/contact/view',
"reset=1&cid={$this->_id}&selectedChild=custom_{$this->_customGroupId}", FALSE, NULL, FALSE);
}
'name' => ts('Name'),
'sort' => 'sort_name',
'direction' => CRM_Utils_Sort::ASCENDING,
+ 'field_name' => 'sort_name',
),
);
'name' => $field['title'],
'sort' => $name,
'direction' => $direction,
+ 'field_name' => CRM_Core_BAO_UFField::isValidFieldName($name) ? $name : $fieldName,
);
$direction = CRM_Utils_Sort::DONTCARE;
$showProfileOverlay
);
if ($result->sort_name) {
- $row['sort_name'] = $result->sort_name;
+ $row[] = $result->sort_name;
$empty = FALSE;
}
else {
$instance->report_id = CRM_Report_Utils_Report::getValueFromUrl();
}
$instance->save();
-
+
if ($instanceID) {
CRM_Utils_Hook::pre('edit', 'ReportInstance', $instance->id, $instance);
}
// add / update navigation as required
if (!empty($navigationParams)) {
- if (!CRM_Utils_Array::value('id',$params) &&
- !CRM_Utils_Array::value('instance_id',$params) &&
+ if (!CRM_Utils_Array::value('id',$params) &&
+ !CRM_Utils_Array::value('instance_id',$params) &&
CRM_Utils_Array::value('id', $navigationParams)) {
unset($navigationParams['id']);
}
if ($this->_contribField) {
$this->_orderBy .= ", {$this->_aliases['civicrm_contribution']}.receive_date DESC";
- }
+ }
}
function postProcess() {
<th>{ts}Qty{/ts}</th>
<th>{ts}Each{/ts}</th>
<th>{ts}Total{/ts}</th>
- {if $pricesetFieldsCount }<th>{ts}Total Participants{/ts}</th>{/if}
+ {if $pricesetFieldsCount }<th>{ts}Total Participants{/ts}</th>{/if}
</tr>
{foreach from=$value item=line}
<tr>
<td>
- {if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}<div>{$line.description|truncate:30:"..."}</div>{/if}
+ {if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}<div>{$line.description|truncate:30:"..."}</div>{/if}
</td>
<td>
{$line.qty}
<td>
{$line.line_total|crmMoney}
</td>
- {if $pricesetFieldsCount }
- <td>
- {$line.participant_count}
+ {if $pricesetFieldsCount }
+ <td>
+ {$line.participant_count}
</td>
- {/if}
+ {/if}
</tr>
{/foreach}
</table>
</tr>
{if $pricesetFieldsCount }
<tr>
- <td {$labelStyle}>
- {ts}Total Participants{/ts}</td>
+ <td {$labelStyle}>
+ {ts}Total Participants{/ts}</td>
<td {$valueStyle}>
- {assign var="count" value= 0}
+ {assign var="count" value= 0}
{foreach from=$lineItem item=pcount}
{assign var="lineItemCount" value=0}
{if $pcount neq 'skip'}
{/foreach}
{if $lineItemCount < 1 }
assign var="lineItemCount" value=1}
- {/if}
+ {/if}
{assign var="count" value=$count+$lineItemCount}
{/if}
{/foreach}
- {$count}
+ {$count}
</td>
</tr>
{/if}
{/foreach}
{if $lineItemCount < 1 }
{assign var="lineItemCount" value=1}
- {/if}
+ {/if}
{assign var="count" value=$count+$lineItemCount}
{/if}
{/foreach}
{ts}Total Participants{/ts}: {$count}
{/if}
-
+
{if $is_pay_later }
==========================================================={if $pricesetFieldsCount }===================={/if}
<tr>
<td>
-
<p>Dear {contact.display_name},</p>
+ <p>Dear {contact.display_name},</p>
{if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)}
<p>{$event.confirm_email_text|htmlize}</p>
{else}
-
<p>Thank you for your participation. This letter is a confirmation that your registration has been received and your status has been updated to <strong>{if $isOnWaitlist}waitlisted{else}registered{/if}</strong> for the following:</p>
+ <p>Thank you for your participation. This letter is a confirmation that your registration has been received and your status has been updated to <strong>{if $isOnWaitlist}waitlisted{else}registered{/if}</strong> for the following:</p>
{/if}
{if $conference_sessions}
<tr>
<td colspan="2" {$labelStyle}>
- {ts}Your schedule:{/ts}
+ {ts}Your schedule:{/ts}
</td>
</tr>
<tr>
<td colspan="2" {$valueStyle}>
- {assign var='group_by_day' value='NA'}
- {foreach from=$conference_sessions item=session}
- {if $session.start_date|date_format:"%Y/%m/%d" != $group_by_day|date_format:"%Y/%m/%d"}
- {assign var='group_by_day' value=$session.start_date}
+ {assign var='group_by_day' value='NA'}
+ {foreach from=$conference_sessions item=session}
+ {if $session.start_date|date_format:"%Y/%m/%d" != $group_by_day|date_format:"%Y/%m/%d"}
+ {assign var='group_by_day' value=$session.start_date}
<em>{$group_by_day|date_format:"%m/%d/%Y"}</em><br />
- {/if}
- {$session.start_date|crmDate:0:1}{if $session.end_date}-{$session.end_date|crmDate:0:1}{/if} {$session.title}<br />
- {if $session.location} {$session.location}<br />{/if}
- {/foreach}
+ {/if}
+ {$session.start_date|crmDate:0:1}{if $session.end_date}-{$session.end_date|crmDate:0:1}{/if} {$session.title}<br />
+ {if $session.location} {$session.location}<br />{/if}
+ {/foreach}
</td>
</tr>
{/if}
</tr>
<tr>
<td colspan="2" {$valueStyle}>
- {$payer.name}
+ {$payer.name}
</td>
</tr>
{/if}
<th>{ts}Qty{/ts}</th>
<th>{ts}Each{/ts}</th>
<th>{ts}Total{/ts}</th>
- {if $pricesetFieldsCount }<th>{ts}Total Participants{/ts}</th>{/if}
+ {if $pricesetFieldsCount }<th>{ts}Total Participants{/ts}</th>{/if}
</tr>
{foreach from=$value item=line}
<tr>
<td>
{$line.line_total|crmMoney:$currency}
</td>
- {if $pricesetFieldsCount }<td>{$line.participant_count}</td> {/if}
+ {if $pricesetFieldsCount }<td>{$line.participant_count}</td> {/if}
</tr>
{/foreach}
</table>
<tr>
<td {$labelStyle}>
{ts}Total Amount{/ts}
- </td>
+ </td>
<td {$valueStyle}>
{$totalAmount|crmMoney:$currency} {if $hookDiscount.message}({$hookDiscount.message}){/if}
</td>
</tr>
{if $pricesetFieldsCount }
<tr>
- <td {$labelStyle}>
- {ts}Total Participants{/ts}</td>
+ <td {$labelStyle}>
+ {ts}Total Participants{/ts}</td>
<td {$valueStyle}>
- {assign var="count" value= 0}
+ {assign var="count" value= 0}
{foreach from=$lineItem item=pcount}
{assign var="lineItemCount" value=0}
{if $pcount neq 'skip'}
{/foreach}
{if $lineItemCount < 1 }
{assign var="lineItemCount" value=1}
- {/if}
+ {/if}
{assign var="count" value=$count+$lineItemCount}
{/if}
{/foreach}
<tr><th {$headerStyle}>{$customProfile.title.$pid}</th></tr>
{foreach from=$eachProfile item=val key=field}
<tr>{foreach from=$val item=v key=f}
- <td {$labelStyle}>{$field}</td>
- <td {$valueStyle}>{$v}</td>
+ <td {$labelStyle}>{$field}</td>
+ <td {$valueStyle}>{$v}</td>
{/foreach}
</tr>
{/foreach}
{/foreach}
{/foreach}
{/if}
-
+
</table>
</td>
</tr>
{/foreach}
{if $lineItemCount < 1 }
{assign var="lineItemCount" value=1}
- {/if}
+ {/if}
{assign var="count" value=$count+$lineItemCount}
{/if}
{/foreach}
{ts}Total Participants{/ts}: {$count}
{/if}
-
+
{if $register_date}
{ts}Registration Date{/ts}: {$register_date|crmDate}
{/if}
{foreach from=$customPost item=customPos key=j}
==========================================================={if $pricesetFieldsCount }===================={/if}
-{$customPost_grouptitle.$j}
+{$customPost_grouptitle.$j}
==========================================================={if $pricesetFieldsCount }===================={/if}
{foreach from=$customPos item=customValue key=customName}
function upgrade_4_3_4($rev) {
$this->addTask(ts('Upgrade DB to 4.3.4: SQL'), 'task_4_3_x_runSql', $rev);
}
-
+
function upgrade_4_3_5($rev) {
// CRM-12156
$config = CRM_Core_Config::singleton();
AND CONSTRAINT_SCHEMA = %1";
$params = array(1 => array($dbname['database'], 'String'));
$onDelete = CRM_Core_DAO::singleValueQuery($sql, $params, TRUE, FALSE);
-
+
if ($onDelete != 'CASCADE') {
$query = "ALTER TABLE `civicrm_financial_item`
DROP FOREIGN KEY FK_civicrm_financial_item_contact_id,
* This hook is called when rendering the tabs
* used for events and potentially contribution pages, etc
* @param string $tabset - name of the screen or visual element
- * @param array $tabs - the array of tabs that will be displayed
+ * @param array $tabs - the array of tabs that will be displayed
* @param array $context - extra data about the screen or context in which the tab is used
*
- * @return null
+ * @return null
* @access public
*/
static function tabset($tabsetName, &$tabs, $context) {
}
/**
- * This hook is called while building the core search query,
+ * This hook is called while building the core search query,
* so hook implementers can provide their own query objects which alters/extends core search.
*
* @param Array $queryObjects
// Get the framework.
if (file_exists($joomlaBase . '/libraries/import.legacy.php')) {
- require $joomlaBase . '/libraries/import.legacy.php';
+ require $joomlaBase . '/libraries/import.legacy.php';
}
require $joomlaBase . '/libraries/import.php';
require $joomlaBase . '/libraries/joomla/event/dispatcher.php';
'action' => 'create',
));
$meta = $result['values'];
+ if (!isset($meta[$fieldName]['name']) && isset($meta[$fieldName . '_id'])) {
+ $fieldName = $fieldName . '_id';
+ }
if (isset($meta[$fieldName])) {
return $meta[$fieldName]['name'];
}
}
.activity a:link, .activity a:visited {
-}
+}
.activityheader {
display: none;
height: auto;
margin: 0 1px;
padding: 2px 5px;
- font-family: Arial, Helvetica, sans-serif;
+ font-family: Arial, Helvetica, sans-serif;
}
.crm-container #alpha-filter a {
// initialize the alternate select multiple
// this loop ensures uniqueness, in case of existing crmasmSelects placed by ajax (1.0.3)
- while($("#" + options.containerClass + index).size() > 0) index++;
+ while($("#" + options.containerClass + index).size() > 0) index++;
$select = $("<select></select>")
.addClass(options.selectClass)
.attr('name', options.selectClass + index)
- .attr('id', options.selectClass + index);
+ .attr('id', options.selectClass + index);
- $selectRemoved = $("<select></select>");
+ $selectRemoved = $("<select></select>");
$ol = $("<" + options.listType + "></" + options.listType + ">")
.addClass(options.listClass)
- .attr('id', options.listClass + index);
+ .attr('id', options.listClass + index);
$container = $("<div></div>")
.addClass(options.containerClass)
'id': optionId,
'item': $ol.children("[rel=" + optionId + "]"),
'type': type
- }]);
+ }]);
}
init();
});
};
-})(jQuery);
+})(jQuery);
+
*
*
* This offers two features:
-* - crmEditable() edit in place of a single field
+* - crmEditable() edit in place of a single field
* (mostly a wrapper that binds jeditable features with the ajax api and replies on crm-entity crmf-{field} html conventions)
* if you want to add an edit in place on a template:
* - add a class crm-entity and id {EntityName}-{Entityid} higher in the dom
if (!getEntityID (this,function (e,id) {
entity=e;
params.id = id;
-
+
})) { return };
params['field']=getFieldName(this);
var id= $i.closest('.crm-entity').attr('id');
if (id) {
var e=id.match(/(\S*)-(\S*)/);
- if (!e)
+ if (!e)
console && console.log && console.log("Couldn't get the entity id. You need to set class='crm-entity' id='{entityName}-{id}'");
formSettings.entity=e[1];
formSettings.id=e[2];
{ts 1='4111111111111111' 2='76'}The test Credit Card number is %1 - this is the only credit card number that will work on the test gateway. The test Total Amount can be any amount except one that ends in a value of .%2 (e.g. $10.%2) - all amounts ending in .%2 will return a failed response.{/ts}
{/htxt}
-{htxt id='Payment_Express-test-url-site'} {ts}This is the URL for accessing the DPS/Payment Express payment site.
+{htxt id='Payment_Express-test-url-site'} {ts}This is the URL for accessing the DPS/Payment Express payment site.
If you have been given a MAC key please fill in the Mac Key field, and use https://sec.paymentexpress.com/pxpay/pxpay.aspx for the Site URL.
Otherwise use https://sec.paymentexpress.com/pxpay/pxaccess.aspx for the Site URL.{/ts} {/htxt}
{htxt id='Payment_Express-live-user-name'} {ts}Payment Express UserID (LIVE account):{/ts}
{ts}This is the live user name provided to you by DPS/Payment Express.{/ts}{/htxt}
-{htxt id='Payment_Express-live-url-site'} {ts}This is the URL for accessing the DPS/Payment Express payment site.
+{htxt id='Payment_Express-live-url-site'} {ts}This is the URL for accessing the DPS/Payment Express payment site.
If you have been given a MAC key please fill in the Mac Key field, and use https://sec.paymentexpress.com/pxpay/pxpay.aspx for the Site URL.
-Otherwise use https://sec.paymentexpress.com/pxpay/pxaccess.aspx for the Site URL.{/ts} {/htxt}
+Otherwise use https://sec.paymentexpress.com/pxpay/pxaccess.aspx for the Site URL.{/ts} {/htxt}
{htxt id='Elavon-live-user-name'}
<p>{ts}This is the LIVE <strong>Elavon Merchant ID</strong> associated with your Elavon account.{/ts}</p>
{counter start=0 skip=1 print=false}
{foreach from=$rows item=row name=listings}
<tr id="row-{$smarty.foreach.listings.iteration}" class="{cycle values="odd-row,even-row"}">
- {foreach from=$row item=value}
- <td>{$value}</td>
+ {foreach from=$row key=index item=value}
+ {if $columnHeaders.$index.field_name}
+ <td class="crm-{$columnHeaders.$index.field_name}">{$value}</td>
+ {else}
+ <td>{$value}</td>
+ {/if}
{/foreach}
</tr>
{/foreach}
'18', '19', '20', '22', '23', '24',
),
),
-
+
// gender_id 1
array(
'fv' => array('gender' => 'Female'),
'name' => 'paymentProcessor',
);
$processor = CRM_Financial_BAO_PaymentProcessor::create($params);
-
+
$account = CRM_Financial_BAO_FinancialTypeAccount::getFinancialAccount(
$processor->id,
'civicrm_payment_processor'
return array(
array(
'CRM_Report_Form_Contribute_Detail',
- array(
+ array(
'fields' => array(
'first_name',
'email',
// FIXME: add filters
),
'fixtures/dataset.sql',
- 'fixtures/report.csv',
+ 'fixtures/report.csv',
),
);
}
*/
public function testReportOutput($reportClass, $inputParams, $dataSet, $expectedOutputCsvFile) {
$this->foreignKeyChecksOff();
-
+
$this->quickCleanup(self::$_tablesToTruncate);
$config = CRM_Core_Config::singleton();
{literal}<?php{/literal}
/*
- {$description}
+ *{$description}
*/
function {$function}_example(){literal}{{/literal}
$params = {$params|@print_array};
projects / civicrm-core.git / commitdiff