| @@ 1646-1649 (lines=4) @@ | ||
| 1643 | ||
| 1644 | $address['street_name'] = $streetAndNumber['streetName']; |
|
| 1645 | $address['street_number'] = $streetAndNumber['streetNumber']; |
|
| 1646 | } else { |
|
| 1647 | $address['street_name'] = $user[$type . 'address']['street']; |
|
| 1648 | $address['street_number'] = $user[$type . 'address']['streetnumber']; |
|
| 1649 | } |
|
| 1650 | } else { |
|
| 1651 | $address['street_address'] = trim( |
|
| 1652 | $user[$type . 'address']['street'] . ' ' . $user[$type . 'address']['streetnumber'] |
|
| @@ 1650-1654 (lines=5) @@ | ||
| 1647 | $address['street_name'] = $user[$type . 'address']['street']; |
|
| 1648 | $address['street_number'] = $user[$type . 'address']['streetnumber']; |
|
| 1649 | } |
|
| 1650 | } else { |
|
| 1651 | $address['street_address'] = trim( |
|
| 1652 | $user[$type . 'address']['street'] . ' ' . $user[$type . 'address']['streetnumber'] |
|
| 1653 | ); |
|
| 1654 | } |
|
| 1655 | ||
| 1656 | // Make sure phone number is unset if empty |
|
| 1657 | if ($address['phone'] === null){ |
|
| @@ 632-635 (lines=4) @@ | ||
| 629 | if (isset($orderAddress['street_name']) && $orderAddress['street_number']) { |
|
| 630 | if (version_compare(Shopware::VERSION, '5.0.0', '>=')) { |
|
| 631 | $data[$type]['street'] = $orderAddress['street_name'] . ' ' . $orderAddress['street_number']; |
|
| 632 | } else { |
|
| 633 | $data[$type]['street'] = $orderAddress['street_name']; |
|
| 634 | $data[$type]['streetnumber'] = $orderAddress['street_number']; |
|
| 635 | } |
|
| 636 | } else { |
|
| 637 | $data[$type]['street'] = $orderAddress['street_address']; |
|
| 638 | $data[$type]['streetnumber'] = ' '; |
|