diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php index 6955e696de01..ef643d67e177 100644 --- a/CRM/Member/BAO/Membership.php +++ b/CRM/Member/BAO/Membership.php @@ -1181,7 +1181,7 @@ public static function fixMembershipStatusBeforeRenew(&$currentMembership, $chan $currentMembership['end_date'], $format ), - 'modified_date' => date('Y-m-d H:i:s', CRM_Utils_Time::strtotime($today)), + 'modified_date' => date('YmdHis', CRM_Utils_Time::strtotime($today)), 'membership_type_id' => $currentMembership['membership_type_id'], 'max_related' => $currentMembership['max_related'] ?? 0, ]; @@ -2490,7 +2490,7 @@ public static function updateMembershipStatus($deceasedParams, $contactType) { 'start_date' => CRM_Utils_Date::isoToMysql($dao->start_date), 'end_date' => CRM_Utils_Date::isoToMysql($dao->end_date), 'modified_id' => $userId, - 'modified_date' => CRM_Utils_Time::date('Ymd'), + 'modified_date' => CRM_Utils_Time::date('YmdHis'), 'membership_type_id' => $dao->membership_type_id, 'max_related' => $dao->max_related, ]; @@ -2576,7 +2576,7 @@ private static function createMembershipLog($membership, string $logStartDate = 'status_id' => $membership->status_id, 'start_date' => $logStartDate, 'end_date' => CRM_Utils_Date::isoToMysql($membership->end_date), - 'modified_date' => CRM_Utils_Time::date('Ymd'), + 'modified_date' => CRM_Utils_Time::date('YmdHis'), 'membership_type_id' => $membershipTypeID ?? $membership->membership_type_id, 'max_related' => $membership->max_related, ]; diff --git a/CRM/Upgrade/Incremental/php/FiveEightyThree.php b/CRM/Upgrade/Incremental/php/FiveEightyThree.php index e804ac577ca0..464c76bca1b5 100644 --- a/CRM/Upgrade/Incremental/php/FiveEightyThree.php +++ b/CRM/Upgrade/Incremental/php/FiveEightyThree.php @@ -29,6 +29,14 @@ class CRM_Upgrade_Incremental_php_FiveEightyThree extends CRM_Upgrade_Incrementa */ public function upgrade_5_83_alpha1($rev): void { $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); + $this->addTask( + 'Convert MembershipLog.modified_date to timestamp', + 'alterColumn', + 'civicrm_membership_log', + 'modified_date', + "timestamp NULL DEFAULT NULL COMMENT 'Date this membership modification action was logged.'", + FALSE + ); } } diff --git a/schema/Member/MembershipLog.entityType.php b/schema/Member/MembershipLog.entityType.php index 633c2c982894..5677c6239fb5 100644 --- a/schema/Member/MembershipLog.entityType.php +++ b/schema/Member/MembershipLog.entityType.php @@ -85,7 +85,7 @@ ], 'modified_date' => [ 'title' => ts('Membership Change Date'), - 'sql_type' => 'date', + 'sql_type' => 'timestamp', 'input_type' => 'Select Date', 'description' => ts('Date this membership modification action was logged.'), 'add' => '1.5',