<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.5 |
+ | CiviCRM version 4.6 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2014 |
+--------------------------------------------------------------------+
*
* @return bool
*/
- function verifyPreDBstate(&$errors) {
+ public function verifyPreDBstate(&$errors) {
return TRUE;
}
* revision to the database.
*
* @param $preUpgradeMessage
- * @param $rev string, a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'
+ * @param $rev
+ * String, a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'.
* @param null $currentVer
*
- * @internal param string $postUpgradeMessage , alterable
* @return void
*/
- function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) {
+ public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) {
}
/**
* Compute any messages which should be displayed after upgrade
*
- * @param $postUpgradeMessage string, alterable
- * @param $rev string, an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs
+ * @param $postUpgradeMessage
+ * String, alterable.
+ * @param $rev
+ * String, an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs.
* @return void
*/
- function setPostUpgradeMessage(&$postUpgradeMessage, $rev) {
+ public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) {
if ($rev == '4.5.alpha1') {
- $postUpgradeMessage .= '<br /><br />' . ts('Default versions of the following System Workflow Message Templates have been modified to handle new functionality: <ul><li>Contributions - Receipt (off-line)</li><li>Contributions - Receipt (on-line)</li><li>Memberships - Receipt (on-line)</li><li>Memberships - Signup and Renewal Receipts (off-line)</li><li>Pledges - Acknowledgement</li></ul> If you have modified these templates, please review the new default versions and implement updates as needed to your copies (Administer > Communications > Message Templates > System Workflow Messages). (<a href="%1">learn more...</a>)', array(1 => 'http://wiki.civicrm.org/confluence/display/CRMDOC/Updating+System+Workflow+Message+Templates+after+Upgrades+-+method+1+-+kdiff'));
+ $postUpgradeMessage .= '<br /><br />' . ts('Default versions of the following System Workflow Message Templates have been modified to handle new functionality: <ul><li>Contributions - Receipt (off-line)</li><li>Contributions - Receipt (on-line)</li><li>
Contributions - Recurring Start and End Notification</li><li>Contributions - Recurring Updates</li><li>Memberships - Receipt (on-line)</li><li>Memberships - Signup and Renewal Receipts (off-line)</li><li>Pledges - Acknowledgement</li></ul> If you have modified these templates, please review the new default versions and implement updates as needed to your copies (Administer > Communications > Message Templates > System Workflow Messages). (<a href="%1">learn more...</a>)', array(1 => 'http://wiki.civicrm.org/confluence/display/CRMDOC/Updating+System+Workflow+Message+Templates+after+Upgrades+-+method+1+-+kdiff'));
$postUpgradeMessage .= '<br /><br />' . ts('This release allows you to view and edit multiple-record custom field sets in a table format which will be more usable in some cases. You can try out the format by navigating to Administer > Custom Data & Screens > Custom Fields. Click Settings for a custom field set and change Display Style to "Tab with Tables".');
$postUpgradeMessage .= '<br /><br />' . ts('This release changes the way that anonymous event registrations match participants with existing contacts. By default, all event participants will be matched with existing individuals using the Unsupervised rule, even if multiple registrations with the same email address are allowed. However, you can now select a different matching rule to use for each event. Please review your events to make sure you choose the appropriate matching rule and collect sufficient information for it to match contacts.');
}
if ($rev == '4.5.beta2') {
$postUpgradeMessage .= '<br /><br />' . ts('If you use CiviMail for newsletters or other communications, check out the new sample CiviMail templates which use responsive design to optimize display on mobile devices (Administer > Communications > Message Templates ).');
}
+ if ($rev == '4.5.1') {
+ $postUpgradeMessage .= '<br /><br />' . ts('WARNING: If you use CiviCase with v4.5.alpha*, v4.5.beta*, or v4.5.0, it is possible that previous upgrades corrupted some CiviCase metadata. If you have not already done so, please identify any custom field sets, smart groups, or reports which refer to CiviCase and ensure that they are properly configured.');
+ }
}
/**
*
* @return bool
*/
- function upgrade_4_5_alpha1($rev) {
+ public function upgrade_4_5_alpha1($rev) {
// task to process sql
$this->addTask(ts('Migrate honoree information to module_data'), 'migrateHonoreeInfo');
$this->addTask(ts('Upgrade DB to 4.5.alpha1: SQL'), 'task_4_5_x_runSql', $rev);
*
* @return bool
*/
- function upgrade_4_5_beta9($rev) {
+ public function upgrade_4_5_beta9($rev) {
$this->addTask(ts('Upgrade DB to 4.5.beta9: SQL'), 'task_4_5_x_runSql', $rev);
-
- list($minParticipantId, $maxParticipantId) = CRM_Core_DAO::executeQuery('SELECT coalesce(min(id),0), coalesce(max(id),0)
- FROM civicrm_participant_payment')->getDatabaseResult()->fetchRow();
- for ($startId = $minParticipantId; $startId <= $maxParticipantId; $startId += self::BATCH_SIZE) {
- $endId = $startId + self::BATCH_SIZE - 1;
- $title = ts('Upgrade DB to 4.5.beta9: Fix line items for Participant (%1 => %2)', array(1 => $startId, 2 => $endId));
- $this->addTask($title, 'task_4_5_0_fixLineItem', $startId, $endId, 'participant');
- }
- list($minContributionId, $maxContributionId) = CRM_Core_DAO::executeQuery('SELECT coalesce(min(id),0), coalesce(max(id),0)
- FROM civicrm_contribution')->getDatabaseResult()->fetchRow();
- for ($startId = $minContributionId; $startId <= $maxContributionId; $startId += self::BATCH_SIZE) {
- $endId = $startId + self::BATCH_SIZE - 1;
- $title = ts('Upgrade DB to 4.5.beta9: Fix line items for Contibution (%1 => %2)', array(1 => $startId, 2 => $endId));
- $this->addTask($title, 'task_4_5_0_fixLineItem', $startId, $endId, 'contribution');
- }
-
- list($maxMembershipId, $minMembershipId) = CRM_Core_DAO::executeQuery('SELECT coalesce(max(id),0), coalesce(min(id),0)
- FROM civicrm_membership')->getDatabaseResult()->fetchRow();
- for ($startId = $minMembershipId; $startId <= $maxMembershipId; $startId += self::BATCH_SIZE) {
- $endId = $startId + self::BATCH_SIZE - 1;
- $title = ts('Upgrade DB to 4.5.beta9: Fix line items for Membership (%1 => %2)', array(1 => $startId, 2 => $endId));
- $this->addTask($title, 'task_4_5_0_fixLineItem', $startId, $endId, 'membership');
+ $entityTable = array(
+ 'Participant' => 'civicrm_participant_payment',
+ 'Contribution' => 'civicrm_contribution',
+ 'Membership' => 'civicrm_membership',
+ );
+
+ foreach ($entityTable as $label => $tableName) {
+ list($minId, $maxId) = CRM_Core_DAO::executeQuery("SELECT coalesce(min(id),0), coalesce(max(id),0)
+ FROM {$tableName}")->getDatabaseResult()->fetchRow();
+ for ($startId = $minId; $startId <= $maxId; $startId += self::BATCH_SIZE) {
+ $endId = $startId + self::BATCH_SIZE - 1;
+ $title = ts("Upgrade DB to 4.5.beta9: Fix line items for {$label} (%1 => %2)", array(1 => $startId, 2 => $endId));
+ $this->addTask($title, 'task_4_5_0_fixLineItem', $startId, $endId, $label);
+ }
}
-
return TRUE;
}
/**
* (Queue Task Callback)
*
- * Function to update the line items
- *
+ * update the line items
+ *
*
* @param CRM_Queue_TaskContext $ctx
- * @param $startId int, the first/lowest entity ID to convert
- * @param $endId int, the last/highest entity ID to convert
- * @param
+ * @param $startId
+ * Int, the first/lowest entity ID to convert.
+ * @param $endId
+ * Int, the last/highest entity ID to convert.
+ * @param
*
* @return bool
*/
- static function task_4_5_0_fixLineItem(CRM_Queue_TaskContext $ctx, $startId, $endId, $entityTable) {
-
+ public static function task_4_5_0_fixLineItem(CRM_Queue_TaskContext $ctx, $startId, $endId, $entityTable) {
+
$sqlParams = array(
1 => array($startId, 'Integer'),
2 => array($endId, 'Integer'),
);
switch ($entityTable) {
- case 'contribution':
+ case 'Contribution':
// update all the line item entity_table and entity_id with contribution due to bug CRM-15055
- CRM_Core_DAO::executeQuery("UPDATE civicrm_line_item cln
- INNER JOIN civicrm_contribution cc ON cc.id = cln.contribution_id
- SET entity_id = cln.contribution_id, entity_table = 'civicrm_contribution'
- WHERE cln.contribution_id IS NOT NULL AND cln.entity_table <> 'civicrm_participant' AND (cc.id BETWEEN %1 AND %2)", $sqlParams);
-
+ CRM_Core_DAO::executeQuery("UPDATE civicrm_line_item li
+ INNER JOIN civicrm_contribution cc ON cc.id = li.contribution_id
+ SET entity_id = li.contribution_id, entity_table = 'civicrm_contribution'
+ WHERE li.contribution_id IS NOT NULL AND li.entity_table <> 'civicrm_participant' AND (cc.id BETWEEN %1 AND %2)", $sqlParams);
+
// update the civicrm_line_item.contribution_id
- CRM_Core_DAO::executeQuery("UPDATE civicrm_line_item cln
- INNER JOIN civicrm_contribution cc ON cc.id = cln.entity_id
+ CRM_Core_DAO::executeQuery("UPDATE civicrm_line_item li
+ INNER JOIN civicrm_contribution cc ON cc.id = li.entity_id
SET contribution_id = entity_id
- WHERE cln.contribution_id IS NULL AND cln.entity_table = 'civicrm_contribution' AND (cc.id BETWEEN %1 AND %2)", $sqlParams);
+ WHERE li.contribution_id IS NULL AND li.entity_table = 'civicrm_contribution' AND (cc.id BETWEEN %1 AND %2)", $sqlParams);
break;
-
- case 'participant':
+
+ case 'Participant':
// update the civicrm_line_item.contribution_id
- CRM_Core_DAO::executeQuery("UPDATE civicrm_line_item li
+ CRM_Core_DAO::executeQuery("UPDATE civicrm_line_item li
INNER JOIN civicrm_participant_payment pp ON pp.participant_id = li.entity_id
SET li.contribution_id = pp.contribution_id
- WHERE li.entity_table = 'civicrm_participant' AND cli.contribution_id IS NULL AND (pp.id BETWEEN %1 AND %2)", $sqlParams);
+ WHERE li.entity_table = 'civicrm_participant' AND li.contribution_id IS NULL AND (pp.id BETWEEN %1 AND %2)", $sqlParams);
break;
-
- case 'membership':
+
+ case 'Membership':
$upgrade = new CRM_Upgrade_Form();
// update the line item of membership
CRM_Core_DAO::executeQuery("UPDATE civicrm_line_item li
INNER JOIN civicrm_price_field_value pv ON pv.id = li.price_field_value_id
SET li.entity_table = 'civicrm_membership', li.entity_id = mp.membership_id
WHERE li.entity_table = 'civicrm_contribution'
- AND pv.membership_type_id IS NOT NULL AND cm.membership_type_id = pv.membership_type_id AND (cm.id BETWEEN %1 AND %2)");
-
+ AND pv.membership_type_id IS NOT NULL AND cm.membership_type_id = pv.membership_type_id AND (cm.id BETWEEN %1 AND %2)", $sqlParams);
+
CRM_Core_DAO::executeQuery("UPDATE civicrm_line_item li
INNER JOIN civicrm_membership_payment mp ON mp.contribution_id = li.contribution_id
INNER JOIN civicrm_price_field_value pv ON pv.id = li.price_field_value_id
SET li.entity_table = 'civicrm_membership', li.entity_id = mp.membership_id
WHERE li.entity_table = 'civicrm_contribution'
- AND pv.membership_type_id IS NOT NULL AND (cmp.membership_id BETWEEN %1 AND %2)", $sqlParams);
-
- CRM_Core_DAO::executeQuery("INSERT INTO civicrm_line_item (entity_table, entity_id, price_field_id, label,
+ AND pv.membership_type_id IS NOT NULL AND (mp.membership_id BETWEEN %1 AND %2)", $sqlParams);
+
+ CRM_Core_DAO::executeQuery("INSERT INTO civicrm_line_item (entity_table, entity_id, price_field_id, label,
qty, unit_price, line_total, price_field_value_id, financial_type_id)
- SELECT 'civicrm_membership', cm.id, cpf.id price_field_id, cpfv.label, 1 as qty, cpfv.amount, cpfv.amount line_total,
+ SELECT 'civicrm_membership', cm.id, cpf.id price_field_id, cpfv.label, 1 as qty, cpfv.amount, cpfv.amount line_total,
cpfv.id price_field_value_id, cpfv.financial_type_id FROM civicrm_membership cm
LEFT JOIN civicrm_membership_payment cmp ON cmp.membership_id = cm.id
- LEFT JOIN civicrm_price_field_value cpfv ON cpfv.membership_type_id = cm.membership_type_id
- LEFT JOIN civicrm_price_field cpf ON cpf.id = cpfv.price_field_id
- LEFT JOIN civicrm_price_set cps ON cps.id = cpf.price_set_id
+ INNER JOIN civicrm_price_field_value cpfv ON cpfv.membership_type_id = cm.membership_type_id
+ INNER JOIN civicrm_price_field cpf ON cpf.id = cpfv.price_field_id
+ INNER JOIN civicrm_price_set cps ON cps.id = cpf.price_set_id
WHERE cmp.contribution_id IS NULL AND cps.name = 'default_membership_type_amount' AND (cm.id BETWEEN %1 AND %2)", $sqlParams);
break;
- }
+ }
return TRUE;
}
*
* @return bool TRUE for success
*/
- static function addNameFieldOptions(CRM_Queue_TaskContext $ctx) {
+ public static function addNameFieldOptions(CRM_Queue_TaskContext $ctx) {
$query = "SELECT `value` FROM `civicrm_setting` WHERE `group_name` = 'CiviCRM Preferences' AND `name` = 'contact_edit_options'";
$dao = CRM_Core_DAO::executeQuery($query);
$dao->fetch();
*
* @return bool TRUE for success
*/
- static function migrateHonoreeInfo(CRM_Queue_TaskContext $ctx) {
+ public static function migrateHonoreeInfo(CRM_Queue_TaskContext $ctx) {
$query = "ALTER TABLE `civicrm_uf_join`
ADD COLUMN `module_data` longtext COMMENT 'Json serialized array of data used by the ufjoin.module'";
CRM_Core_DAO::executeQuery($query);
/**
* (Queue Task Callback)
*/
- static function task_4_5_x_runSql(CRM_Queue_TaskContext $ctx, $rev) {
+ public static function task_4_5_x_runSql(CRM_Queue_TaskContext $ctx, $rev) {
$upgrade = new CRM_Upgrade_Form();
$upgrade->processSQL($rev);
projects / civicrm-core.git / blobdiff