Skip to content
This repository was archived by the owner on Sep 16, 2022. It is now read-only.

Fix address field overrides #52

Merged
mspae merged 1 commit into from
Nov 20, 2018
Merged

Fix address field overrides #52

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
8 changes: 7 additions & 1 deletion modules/editable_view_mode/modules/editable_address/editable_address.module
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,13 @@ function editable_address_editable_field_definition_alter(&$field_definition) {
$field_definition['settings']['available_countries'] = $available_countries;
}
foreach ($available_countries as $available_country) {
$field_overrides = new FieldOverrides($field_definition['settings']['field_overrides']);
$overrides = $field_definition['settings']['field_overrides'];
foreach ($overrides as $field_name => $override) {
if (is_array($override)) {
$overrides[$field_name] = reset($override);
}
}
$field_overrides = new FieldOverrides($overrides);
/** @var \CommerceGuys\Addressing\AddressFormat\AddressFormat $address_format */
$address_format = \Drupal::service('address.address_format_repository')->get($available_country);
$required_fields = AddressFormatHelper::getRequiredFields($address_format, $field_overrides);
Expand Down