[3.0.x.x] Disabled custom fields are displayed when editing customer in admin

[akaunderr]

While editing customer through the admin, the disabled custom fields are still displayed, see the code below:

opencart/upload/admin/controller/customer/customer.php

Lines 770 to 812 in f5dadb8

	$data['custom_fields'][] = array(
	'custom_field_id' => $custom_field['custom_field_id'],
	'custom_field_value' => $this->model_customer_custom_field->getCustomFieldValues($custom_field['custom_field_id']),
	'name' => $custom_field['name'],
	'value' => $custom_field['value'],
	'type' => $custom_field['type'],
	'location' => $custom_field['location'],
	'sort_order' => $custom_field['sort_order']
	);
	if($custom_field['type'] == 'file') {
	if(isset($data['account_custom_field'][$custom_field['custom_field_id']])) {
	$code = $data['account_custom_field'][$custom_field['custom_field_id']];
	$upload_result = $this->model_tool_upload->getUploadByCode($code);
	$data['account_custom_field'][$custom_field['custom_field_id']] = array();
	if($upload_result) {
	$data['account_custom_field'][$custom_field['custom_field_id']]['name'] = $upload_result['name'];
	$data['account_custom_field'][$custom_field['custom_field_id']]['code'] = $upload_result['code'];
	} else {
	$data['account_custom_field'][$custom_field['custom_field_id']]['name'] = "";
	$data['account_custom_field'][$custom_field['custom_field_id']]['code'] = $code;
	}
	}
	foreach($data['addresses'] as $address_id => $address) {
	if(isset($address['custom_field'][$custom_field['custom_field_id']])) {
	$code = $address['custom_field'][$custom_field['custom_field_id']];
	$upload_result = $this->model_tool_upload->getUploadByCode($code);
	$data['addresses'][$address_id]['custom_field'][$custom_field['custom_field_id']] = array();
	if($upload_result) {
	$data['addresses'][$address_id]['custom_field'][$custom_field['custom_field_id']]['name'] = $upload_result['name'];
	$data['addresses'][$address_id]['custom_field'][$custom_field['custom_field_id']]['code'] = $upload_result['code'];
	} else {
	$data['addresses'][$address_id]['custom_field'][$custom_field['custom_field_id']]['name'] = "";
	$data['addresses'][$address_id]['custom_field'][$custom_field['custom_field_id']]['code'] = $code;
	}
	}
	}
	}

opencart/upload/admin/controller/customer/customer.php

Lines 1034 to 1038 in f5dadb8

	if (($custom_field['location'] == 'account') && $custom_field['required'] && empty($this->request->post['custom_field'][$custom_field['custom_field_id']])) {
	$this->error['custom_field'][$custom_field['custom_field_id']] = sprintf($this->language->get('error_custom_field'), $custom_field['name']);
	} elseif (($custom_field['location'] == 'account') && ($custom_field['type'] == 'text') && !empty($custom_field['validation']) && !filter_var($this->request->post['custom_field'][$custom_field['custom_field_id']], FILTER_VALIDATE_REGEXP, array('options' => array('regexp' => $custom_field['validation'])))) {
	$this->error['custom_field'][$custom_field['custom_field_id']] = sprintf($this->language->get('error_custom_field'), $custom_field['name']);
	}

opencart/upload/admin/controller/customer/customer.php

Lines 1086 to 1090 in f5dadb8

	if (($custom_field['location'] == 'address') && $custom_field['required'] && empty($value['custom_field'][$custom_field['custom_field_id']])) {
	$this->error['address'][$key]['custom_field'][$custom_field['custom_field_id']] = sprintf($this->language->get('error_custom_field'), $custom_field['name']);
	} elseif (($custom_field['location'] == 'address') && ($custom_field['type'] == 'text') && !empty($custom_field['validation']) && !filter_var($value['custom_field'][$custom_field['custom_field_id']], FILTER_VALIDATE_REGEXP, array('options' => array('regexp' => $custom_field['validation'])))) {
	$this->error['address'][$key]['custom_field'][$custom_field['custom_field_id']] = sprintf($this->language->get('error_custom_field'), $custom_field['name']);
	}

opencart/upload/admin/controller/customer/customer.php

Lines 1131 to 1135 in f5dadb8

	if (($custom_field['location'] == 'affiliate') && $custom_field['required'] && empty($this->request->post['custom_field']['affiliate'][$custom_field['custom_field_id']])) {
	$this->error['custom_field'][$custom_field['custom_field_id']] = sprintf($this->language->get('error_custom_field'), $custom_field['name']);
	} elseif (($custom_field['location'] == 'affiliate') && ($custom_field['type'] == 'text') && !empty($custom_field['validation']) && !filter_var($this->request->post['custom_field']['affiliate'][$custom_field['custom_field_id']], FILTER_VALIDATE_REGEXP, array('options' => array('regexp' => $custom_field['validation'])))) {
	$this->error['custom_field'][$custom_field['custom_field_id']] = sprintf($this->language->get('error_custom_field'), $custom_field['name']);
	}

All this should be wrapped up with a condition

if ($custom_field['status']) {
...
}

Or use something such as:

if (!$custom_field['status']) {
	continue;
}