From 185357666a2bc548d8a1b8e7f6e71f23bba8e508 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Mon, 18 Sep 2023 16:56:43 +1200 Subject: [PATCH] Jenkins rejected the deprecated function in the style check --- ext/eventcart/CRM/Event/Cart/Form/Checkout/Payment.php | 2 +- xml/schema/Event/Event.xml | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ext/eventcart/CRM/Event/Cart/Form/Checkout/Payment.php b/ext/eventcart/CRM/Event/Cart/Form/Checkout/Payment.php index 580512291e..ba283646d6 100644 --- a/ext/eventcart/CRM/Event/Cart/Form/Checkout/Payment.php +++ b/ext/eventcart/CRM/Event/Cart/Form/Checkout/Payment.php @@ -501,7 +501,7 @@ class CRM_Event_Cart_Form_Checkout_Payment extends CRM_Event_Cart_Form_Cart { $params['is_pay_later'] = 0; } if ($trxnDetails == NULL) { - $params['trxn_id'] = $trxn_prefix . strftime("%Y%m%d%H%M%S"); + $params['trxn_id'] = $trxn_prefix . date('YmdHMS'); $params['trxn_date'] = $params['now']; } diff --git a/xml/schema/Event/Event.xml b/xml/schema/Event/Event.xml index 987d8e01eb..0ed5c2e863 100644 --- a/xml/schema/Event/Event.xml +++ b/xml/schema/Event/Event.xml @@ -884,12 +884,13 @@ slot_label_id int unsigned Subevent Slot Label ID + true NULL - Subevent slot label. Implicit FK to civicrm_option_value where option_group = conference_slot. + Needs to be moved to Event cart extension. Subevent slot label. Implicit FK to civicrm_option_value where option_group = conference_slot. 4.1 - Select - + Select + dedupe_rule_group_id -- 2.25.1