Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix submit handling of thousands when creating data entry batch #22772

Merged
merged 1 commit into from
Feb 25, 2022
Merged

Fix submit handling of thousands when creating data entry batch #22772

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 26 additions & 20 deletions CRM/Batch/Form/Batch.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,15 @@
+--------------------------------------------------------------------+
*/

use Civi\Api4\Batch;

/**
* This class generates form components for batch entry.
*/
class CRM_Batch_Form_Batch extends CRM_Admin_Form {

protected $submittableMoneyFields = ['total'];

/**
* PreProcess function.
*/
Expand All @@ -26,6 +30,8 @@ public function preProcess() {

/**
* Build the form object.
*
* @throws \CRM_Core_Exception
*/
public function buildQuickForm() {
parent::buildQuickForm();
Expand Down Expand Up @@ -69,35 +75,35 @@ public function setDefaultValues() {

/**
* Process the form submission.
*
* @throws \API_Exception
*/
public function postProcess() {
$params = $this->controller->exportValues($this->_name);
public function postProcess(): void {
if ($this->_action & CRM_Core_Action::DELETE) {
CRM_Core_Session::setStatus("", ts("Batch Deleted"), "success");
CRM_Core_Session::setStatus('', ts('Batch Deleted'), 'success');
CRM_Batch_BAO_Batch::deleteBatch($this->_id);
return;
}

if ($this->_id) {
$params['id'] = $this->_id;
}
else {
$session = CRM_Core_Session::singleton();
$params['created_id'] = $session->get('userID');
$params['created_date'] = CRM_Utils_Date::processDate(date("Y-m-d"), date("H:i:s"));
}

// always create with data entry status
$params['status_id'] = CRM_Core_PseudoConstant::getKey('CRM_Batch_BAO_Batch', 'status_id', 'Data Entry');
$batch = CRM_Batch_BAO_Batch::create($params);

// redirect to batch entry page.
$session = CRM_Core_Session::singleton();
$batchID = Batch::save(FALSE)->setRecords([
[
// Always create with data entry status.
'status_id:name' => 'Data Entry',
'id' => $this->_id,
'title' => $this->getSubmittedValue('title'),
'description' => $this->getSubmittedValue('description'),
'type_id' => $this->getSubmittedValue('type_id'),
'total' => $this->getSubmittedValue('total'),
'item_count' => $this->getSubmittedValue('item_count'),
],
])->execute()->first()['id'];

// Redirect to batch entry page.
if ($this->_action & CRM_Core_Action::ADD) {
$session->replaceUserContext(CRM_Utils_System::url('civicrm/batch/entry', "id={$batch->id}&reset=1&action=add"));
CRM_Core_Session::singleton()->replaceUserContext(CRM_Utils_System::url('civicrm/batch/entry', "id={$batchID}&reset=1&action=add"));
}
else {
$session->replaceUserContext(CRM_Utils_System::url('civicrm/batch/entry', "id={$batch->id}&reset=1"));
CRM_Core_Session::singleton()->replaceUserContext(CRM_Utils_System::url('civicrm/batch/entry', "id={$batchID}&reset=1"));
}
}

Expand Down