@@ 2053-2056 (lines=4) @@ | ||
2050 | ||
2051 | $address['street_name'] = $streetAndNumber['streetName']; |
|
2052 | $address['street_number'] = $streetAndNumber['streetNumber']; |
|
2053 | } else { |
|
2054 | $address['street_name'] = $user[$type . 'address']['street']; |
|
2055 | $address['street_number'] = $user[$type . 'address']['streetnumber']; |
|
2056 | } |
|
2057 | } else { |
|
2058 | $address['street_address'] = trim( |
|
2059 | $user[$type . 'address']['street'] . ' ' . $user[$type . 'address']['streetnumber'] |
|
@@ 2057-2061 (lines=5) @@ | ||
2054 | $address['street_name'] = $user[$type . 'address']['street']; |
|
2055 | $address['street_number'] = $user[$type . 'address']['streetnumber']; |
|
2056 | } |
|
2057 | } else { |
|
2058 | $address['street_address'] = trim( |
|
2059 | $user[$type . 'address']['street'] . ' ' . $user[$type . 'address']['streetnumber'] |
|
2060 | ); |
|
2061 | } |
|
2062 | ||
2063 | return $address; |
|
2064 | } |
@@ 176-179 (lines=4) @@ | ||
173 | if (isset($orderAddress['street_name']) && $orderAddress['street_number']) { |
|
174 | if (version_compare(Shopware::VERSION, '5.0.0', '>=')) { |
|
175 | $data[$type]['street'] = $orderAddress['street_name'] . ' ' . $orderAddress['street_number']; |
|
176 | } else { |
|
177 | $data[$type]['street'] = $orderAddress['street_name']; |
|
178 | $data[$type]['streetnumber'] = $orderAddress['street_number']; |
|
179 | } |
|
180 | } else { |
|
181 | $data[$type]['street'] = $orderAddress['street_address']; |
|
182 | $data[$type]['streetnumber'] = ' '; |