| @@ 623-626 (lines=4) @@ | ||
| 620 | if (isset($orderAddress['street_name']) && $orderAddress['street_number']) { |
|
| 621 | if (version_compare(Shopware::VERSION, '5.0.0', '>=')) { |
|
| 622 | $data[$type]['street'] = $orderAddress['street_name'] . ' ' . $orderAddress['street_number']; |
|
| 623 | } else { |
|
| 624 | $data[$type]['street'] = $orderAddress['street_name']; |
|
| 625 | $data[$type]['streetnumber'] = $orderAddress['street_number']; |
|
| 626 | } |
|
| 627 | } else { |
|
| 628 | $data[$type]['street'] = $orderAddress['street_address']; |
|
| 629 | $data[$type]['streetnumber'] = ' '; |
|
| @@ 1655-1658 (lines=4) @@ | ||
| 1652 | ||
| 1653 | $address['street_name'] = $streetAndNumber['streetName']; |
|
| 1654 | $address['street_number'] = $streetAndNumber['streetNumber']; |
|
| 1655 | } else { |
|
| 1656 | $address['street_name'] = $user[$type . 'address']['street']; |
|
| 1657 | $address['street_number'] = $user[$type . 'address']['streetnumber']; |
|
| 1658 | } |
|
| 1659 | } else { |
|
| 1660 | $address['street_address'] = trim( |
|
| 1661 | $user[$type . 'address']['street'] . ' ' . $user[$type . 'address']['streetnumber'] |
|
| @@ 1659-1663 (lines=5) @@ | ||
| 1656 | $address['street_name'] = $user[$type . 'address']['street']; |
|
| 1657 | $address['street_number'] = $user[$type . 'address']['streetnumber']; |
|
| 1658 | } |
|
| 1659 | } else { |
|
| 1660 | $address['street_address'] = trim( |
|
| 1661 | $user[$type . 'address']['street'] . ' ' . $user[$type . 'address']['streetnumber'] |
|
| 1662 | ); |
|
| 1663 | } |
|
| 1664 | ||
| 1665 | // Make sure phone number is unset if empty |
|
| 1666 | if ($address['phone'] === null){ |
|