Skip to content
Snippets Groups Projects
Commit 01263fd9 authored by Amy Hudgins's avatar Amy Hudgins Committed by Italo Mairo
Browse files

Issue #3367781 by matthew.h, itamair, dadderley, FiNeX, chucksimply, bojanz:...

Issue #3367781 by matthew.h, itamair, dadderley, FiNeX, chucksimply, bojanz: Fix support for Address module v2.0
parent f7853b4f
No related branches found
No related tags found
1 merge request!30Checking for null values before using address formatter
......@@ -128,14 +128,13 @@ class AddressService extends ServiceProviderBase {
// Use the Address formatter to create a string ordered appropriately
// for the country in the address.
$address = new AddressingAddress();
$address = $address
->withCountryCode($values['country_code'])
->withPostalCode($values['postal_code'])
->withAdministrativeArea($values['administrative_area'])
->withDependentLocality($values['dependent_locality'])
->withLocality($values['locality'])
->withAddressLine1($values['address_line1'])
->withAddressLine2($values['address_line2']);
$address = $values['country_code'] ? $address->withCountryCode($values['country_code']) : $address;
$address = $values['postal_code'] ? $address->withPostalCode($values['postal_code']) : $address;
$address = $values['administrative_area'] ? $address->withAdministrativeArea($values['administrative_area']) : $address;
$address = $values['dependent_locality'] ? $address->withDependentLocality($values['dependent_locality']) : $address;
$address = $values['locality'] ? $address->withLocality($values['locality']) : $address;
$address = $values['address_line1'] ? $address->withAddressLine1($values['address_line1']) : $address;
$address = $values['address_line2'] ? $address->withAddressLine2($values['address_line2']) : $address;
$countrycode = $values['country_code'] ?? NULL;
$langcode = !empty($values['langcode']) ? $values['langcode'] : 'en';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment