From 73409b5bc66af241dae50a0b6753f8018619c083 Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Sat, 30 Mar 2019 13:42:30 +1100 Subject: [PATCH] Fix label of trxn_date field and also fix post processing of trxn_date --- CRM/Contribute/Form/Task/Status.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/CRM/Contribute/Form/Task/Status.php b/CRM/Contribute/Form/Task/Status.php index 94bc70f1d8..c3f4e9d9e6 100644 --- a/CRM/Contribute/Form/Task/Status.php +++ b/CRM/Contribute/Form/Task/Status.php @@ -140,9 +140,7 @@ AND co.id IN ( $contribIDs )"; $this->addRule("fee_amount_{$row['contribution_id']}", ts('Please enter a valid amount.'), 'money'); $defaults["fee_amount_{$row['contribution_id']}"] = 0.0; - $row['trxn_date'] = $this->add('datepicker', "trxn_date_{$row['contribution_id']}", [], FALSE, - ts('Receipt Date'), array('time' => FALSE) - ); + $row['trxn_date'] = $this->add('datepicker', "trxn_date_{$row['contribution_id']}", ts('Transaction Date'), [], FALSE, ['time' => FALSE]); $defaults["trxn_date_{$row['contribution_id']}"] = $now; $this->add("text", "check_number_{$row['contribution_id']}", ts('Check Number')); @@ -294,7 +292,7 @@ AND co.id IN ( $contribIDs )"; else { $input['trxn_id'] = $contribution->invoice_id; } - $input['trxn_date'] = CRM_Utils_Date::processDate($params["trxn_date_{$row['contribution_id']}"], date('H:i:s')); + $input['trxn_date'] = $params["trxn_date_{$row['contribution_id']}"] . ' ' . date('H:i:s'); // @todo calling baseIPN like this is a pattern in it's last gasps. Call contribute.completetransaction api. $baseIPN->completeTransaction($input, $ids, $objects, $transaction, FALSE); -- 2.25.1