From 42347843fe7bf6856994322acbee6db73699a9fb Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Fri, 1 Jan 2021 22:26:58 -0800 Subject: [PATCH] (REF) CRM/Member - Change date() to CRM_Utils_Time::date() --- CRM/Member/BAO/Membership.php | 8 ++++---- CRM/Member/BAO/MembershipType.php | 8 ++++---- CRM/Member/Form/Membership.php | 20 ++++++++++---------- CRM/Member/Form/MembershipRenewal.php | 6 +++--- CRM/Member/Form/MembershipType.php | 4 ++-- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php index ada6d3cd31..44e0de5fed 100644 --- a/CRM/Member/BAO/Membership.php +++ b/CRM/Member/BAO/Membership.php @@ -98,7 +98,7 @@ class CRM_Member_BAO_Membership extends CRM_Member_DAO_Membership { 'status_id' => $membership->status_id, 'start_date' => $logStartDate, 'end_date' => CRM_Utils_Date::isoToMysql($membership->end_date), - 'modified_date' => date('Ymd'), + 'modified_date' => CRM_Utils_Time::date('Ymd'), 'membership_type_id' => $values[$membership->id]['membership_type_id'], 'max_related' => $membership->max_related, ]; @@ -283,7 +283,7 @@ class CRM_Member_BAO_Membership extends CRM_Member_DAO_Membership { 'now', $excludeIsAdmin, $params['membership_type_id'] ?? NULL, $params ); if (empty($calcStatus)) { - throw new CRM_Core_Exception(ts("The membership cannot be saved because the status cannot be calculated for start_date: {$params['start_date']} end_date {$params['end_date']} join_date {$params['join_date']} as at " . date('Y-m-d H:i:s'))); + throw new CRM_Core_Exception(ts("The membership cannot be saved because the status cannot be calculated for start_date: {$params['start_date']} end_date {$params['end_date']} join_date {$params['join_date']} as at " . CRM_Utils_Time::date('Y-m-d H:i:s'))); } $params['status_id'] = $calcStatus['id']; } @@ -2739,7 +2739,7 @@ WHERE {$whereClause}"; 'start_date' => CRM_Utils_Date::isoToMysql($dao->start_date), 'end_date' => CRM_Utils_Date::isoToMysql($dao->end_date), 'modified_id' => $userId, - 'modified_date' => date('Ymd'), + 'modified_date' => CRM_Utils_Time::date('Ymd'), 'membership_type_id' => $dao->membership_type_id, 'max_related' => $dao->max_related, ]; @@ -2756,7 +2756,7 @@ WHERE {$whereClause}"; 'status_id' => 2, 'version' => 3, 'priority_id' => 2, - 'activity_date_time' => date('Y-m-d H:i:s'), + 'activity_date_time' => CRM_Utils_Time::date('Y-m-d H:i:s'), 'is_auto' => 0, 'is_current_revision' => 1, 'is_deleted' => 0, diff --git a/CRM/Member/BAO/MembershipType.php b/CRM/Member/BAO/MembershipType.php index baeb11202e..a0b599f282 100644 --- a/CRM/Member/BAO/MembershipType.php +++ b/CRM/Member/BAO/MembershipType.php @@ -324,7 +324,7 @@ class CRM_Member_BAO_MembershipType extends CRM_Member_DAO_MembershipType { } } if (!$joinDate) { - $joinDate = date('Y-m-d'); + $joinDate = CRM_Utils_Time::date('Y-m-d'); } $actualStartDate = $joinDate; if ($startDate) { @@ -531,7 +531,7 @@ class CRM_Member_BAO_MembershipType extends CRM_Member_DAO_MembershipType { // CRM=7297 Membership Upsell: we need to handle null end_date in case we are switching // from a lifetime to a different membership type if (is_null($membershipDetails->end_date)) { - $date = date('Y-m-d'); + $date = CRM_Utils_Time::date('Y-m-d'); } else { $date = $membershipDetails->end_date; @@ -581,14 +581,14 @@ class CRM_Member_BAO_MembershipType extends CRM_Member_DAO_MembershipType { $year )); } - $today = date('Y-m-d'); + $today = CRM_Utils_Time::date('Y-m-d'); $membershipDates['today'] = CRM_Utils_Date::customFormat($today, '%Y%m%d'); $membershipDates['start_date'] = CRM_Utils_Date::customFormat($startDate, '%Y%m%d'); $membershipDates['end_date'] = CRM_Utils_Date::customFormat($endDate, '%Y%m%d'); $membershipDates['log_start_date'] = CRM_Utils_Date::customFormat($logStartDate, '%Y%m%d'); } else { - $today = date('Y-m-d'); + $today = CRM_Utils_Time::date('Y-m-d'); if ($changeToday) { $today = CRM_Utils_Date::processDate($changeToday, NULL, FALSE, 'Y-m-d'); } diff --git a/CRM/Member/Form/Membership.php b/CRM/Member/Form/Membership.php index a9008897de..8184a7f0d7 100644 --- a/CRM/Member/Form/Membership.php +++ b/CRM/Member/Form/Membership.php @@ -290,7 +290,7 @@ class CRM_Member_Form_Membership extends CRM_Member_Form { //setting default join date and receive date if ($this->_action == CRM_Core_Action::ADD) { - $defaults['receive_date'] = date('Y-m-d H:i:s'); + $defaults['receive_date'] = CRM_Utils_Time::date('Y-m-d H:i:s'); } $defaults['num_terms'] = 1; @@ -352,7 +352,7 @@ DESC limit 1"); //setting default join date if there is no join date if (empty($defaults['join_date'])) { - $defaults['join_date'] = date('Y-m-d'); + $defaults['join_date'] = CRM_Utils_Time::date('Y-m-d'); } if (!empty($defaults['membership_end_date'])) { @@ -554,7 +554,7 @@ DESC limit 1"); CRM_Member_StatusOverrideTypes::getSelectOptions() ); - $this->add('datepicker', 'status_override_end_date', ts('Status Override End Date'), '', FALSE, ['minDate' => date('Y-m-d'), 'time' => FALSE]); + $this->add('datepicker', 'status_override_end_date', ts('Status Override End Date'), '', FALSE, ['minDate' => CRM_Utils_Time::date('Y-m-d'), 'time' => FALSE]); $this->addElement('checkbox', 'record_contribution', ts('Record Membership Payment?')); @@ -1256,7 +1256,7 @@ DESC limit 1"); //get the payment processor id as per mode. Try removing in favour of beginPostProcess. $params['payment_processor_id'] = $formValues['payment_processor_id'] = $this->_paymentProcessor['id']; - $params['register_date'] = date('YmdHis'); + $params['register_date'] = CRM_Utils_Time::date('YmdHis'); // add all the additional payment params we need $formValues['amount'] = $params['total_amount']; @@ -1360,8 +1360,8 @@ DESC limit 1"); } $endDate = $startDate = NULL; } - $now = date('YmdHis'); - $params['receive_date'] = date('Y-m-d H:i:s'); + $now = CRM_Utils_Time::date('YmdHis'); + $params['receive_date'] = CRM_Utils_Time::date('Y-m-d H:i:s'); $params['invoice_id'] = $formValues['invoiceID']; $params['contribution_source'] = ts('%1 Membership Signup: Credit card or direct debit (by %2)', [1 => $this->getSelectedMembershipLabels(), 2 => $userName] @@ -1434,7 +1434,7 @@ DESC limit 1"); // @todo figure out why recieve_date isn't being set right here. if (empty($params['receive_date'])) { - $params['receive_date'] = date('Y-m-d H:i:s'); + $params['receive_date'] = CRM_Utils_Time::date('Y-m-d H:i:s'); } $membershipParams = array_merge($params, $membershipTypeValues[$lineItemValues['membership_type_id']]); @@ -1874,7 +1874,7 @@ DESC limit 1"); $params['payment_instrument_id'] = $contributionParams['payment_instrument_id'] ?? NULL; $recurringContributionID = $this->legacyProcessRecurringContribution($params, $contactID); - $now = date('YmdHis'); + $now = CRM_Utils_Time::date('YmdHis'); $receiptDate = $params['receipt_date'] ?? NULL; if ($isEmailReceipt) { $receiptDate = $now; @@ -1882,7 +1882,7 @@ DESC limit 1"); if (isset($params['amount'])) { $contributionParams = array_merge([ - 'receive_date' => !empty($params['receive_date']) ? CRM_Utils_Date::processDate($params['receive_date']) : date('YmdHis'), + 'receive_date' => !empty($params['receive_date']) ? CRM_Utils_Date::processDate($params['receive_date']) : CRM_Utils_Time::date('YmdHis'), 'tax_amount' => $params['tax_amount'] ?? NULL, 'invoice_id' => $params['invoiceID'], 'currency' => $params['currencyID'], @@ -1964,7 +1964,7 @@ DESC limit 1"); $recurParams['is_test'] = 1; } - $recurParams['start_date'] = $recurParams['create_date'] = $recurParams['modified_date'] = date('YmdHis'); + $recurParams['start_date'] = $recurParams['create_date'] = $recurParams['modified_date'] = CRM_Utils_Time::date('YmdHis'); if (!empty($params['receive_date'])) { $recurParams['start_date'] = date('YmdHis', CRM_Utils_Time::strtotime($params['receive_date'])); } diff --git a/CRM/Member/Form/MembershipRenewal.php b/CRM/Member/Form/MembershipRenewal.php index d2f65ecaeb..e57e54550f 100644 --- a/CRM/Member/Form/MembershipRenewal.php +++ b/CRM/Member/Form/MembershipRenewal.php @@ -180,9 +180,9 @@ class CRM_Member_Form_MembershipRenewal extends CRM_Member_Form { $defaults = parent::setDefaultValues(); // set renewal_date and receive_date to today in correct input format (setDateDefaults uses today if no value passed) - $now = date('Y-m-d'); + $now = CRM_Utils_Time::date('Y-m-d'); $defaults['renewal_date'] = $now; - $defaults['receive_date'] = $now . ' ' . date('H:i:s'); + $defaults['receive_date'] = $now . ' ' . CRM_Utils_Time::date('H:i:s'); if ($defaults['id']) { $defaults['record_contribution'] = CRM_Core_DAO::getFieldValue('CRM_Member_DAO_MembershipPayment', @@ -487,7 +487,7 @@ class CRM_Member_Form_MembershipRenewal extends CRM_Member_Form { $this->storeContactFields($this->_params); $this->beginPostProcess(); $now = CRM_Utils_Date::getToday(NULL, 'YmdHis'); - $this->assign('receive_date', CRM_Utils_Array::value('receive_date', $this->_params, date('Y-m-d H:i:s'))); + $this->assign('receive_date', CRM_Utils_Array::value('receive_date', $this->_params, CRM_Utils_Time::date('Y-m-d H:i:s'))); $this->processBillingAddress(); $this->_params['total_amount'] = CRM_Utils_Array::value('total_amount', $this->_params, diff --git a/CRM/Member/Form/MembershipType.php b/CRM/Member/Form/MembershipType.php index a5c3c7d06d..3222ba7a7a 100644 --- a/CRM/Member/Form/MembershipType.php +++ b/CRM/Member/Form/MembershipType.php @@ -364,14 +364,14 @@ class CRM_Member_Form_MembershipType extends CRM_Member_Form_MembershipConfig { } if ($params['fixed_period_start_day'] && !empty($params['fixed_period_start_day'])) { - $params['fixed_period_start_day']['Y'] = date('Y'); + $params['fixed_period_start_day']['Y'] = CRM_Utils_Time::date('Y'); if (!CRM_Utils_Rule::qfDate($params['fixed_period_start_day'])) { $errors['fixed_period_start_day'] = ts('Please enter valid Fixed Period Start Day'); } } if ($params['fixed_period_rollover_day'] && !empty($params['fixed_period_rollover_day'])) { - $params['fixed_period_rollover_day']['Y'] = date('Y'); + $params['fixed_period_rollover_day']['Y'] = CRM_Utils_Time::date('Y'); if (!CRM_Utils_Rule::qfDate($params['fixed_period_rollover_day'])) { $errors['fixed_period_rollover_day'] = ts('Please enter valid Fixed Period Rollover Day'); } -- 2.25.1