Fix for contribution time

diff --git a/CRM/Event/Form/EventFees.php b/CRM/Event/Form/EventFees.php
index 6eb0b51ad7066630d64a4726a988afe75f7d983b..0fe14140447c76ad27c77c7c104f4e71932ed547 100644 (file)
--- a/CRM/Event/Form/EventFees.php
+++ b/CRM/Event/Form/EventFees.php
@@ -117,7 +117,7 @@ class CRM_Event_Form_EventFees {
         $defaults[$form->_pId]['receipt_text'] = $details[$form->_eventId]['confirm_email_text'];
       }
 
-      list($defaults[$form->_pId]['receive_date']) = CRM_Utils_Date::setDateDefaults();
+      list($defaults[$form->_pId]['receive_date'], $defaults[$form->_pId]['receive_date_time']) = CRM_Utils_Date::setDateDefaults();
     }
 
     //CRM-11601 we should keep the record contribution
@@ -423,7 +423,7 @@ SELECT  id, html_type
           array('' => ts('- select -')) + CRM_Contribute_PseudoConstant::financialType()
         );
 
-        $form->addDate('receive_date', ts('Received'), FALSE, array('formatType' => 'activityDate'));
+        $form->addDateTime('receive_date', ts('Received'), FALSE, array('formatType' => 'activityDateTime'));
 
         $form->add('select', 'payment_instrument_id',
           ts('Paid By'),

diff --git a/CRM/Event/Form/Participant.php b/CRM/Event/Form/Participant.php
index f740dd7a321ab8ac3f66e73b751ed3acbfc0fc5d..3afc3d18203aa6a213c828caf063bcaaf1e48362 100644 (file)
--- a/CRM/Event/Form/Participant.php
+++ b/CRM/Event/Form/Participant.php
@@ -1050,7 +1050,7 @@ class CRM_Event_Form_Participant extends CRM_Contribute_Form_AbstractEditPayment
       unset($params['amount']);
     }
     $params['register_date'] = CRM_Utils_Date::processDate($params['register_date'], $params['register_date_time']);
-    $params['receive_date'] = CRM_Utils_Date::processDate(CRM_Utils_Array::value('receive_date', $params));
+    $params['receive_date'] = CRM_Utils_Date::processDate(CRM_Utils_Array::value('receive_date', $params), CRM_Utils_Array::value('receive_date_time', $params));
     $params['contact_id'] = $this->_contactId;
 
     // overwrite actual payment amount if entered