@@ 1641-1644 (lines=4) @@ | ||
1638 | ||
1639 | $address['street_name'] = $streetAndNumber['streetName']; |
|
1640 | $address['street_number'] = $streetAndNumber['streetNumber']; |
|
1641 | } else { |
|
1642 | $address['street_name'] = $user[$type . 'address']['street']; |
|
1643 | $address['street_number'] = $user[$type . 'address']['streetnumber']; |
|
1644 | } |
|
1645 | } else { |
|
1646 | $address['street_address'] = trim( |
|
1647 | $user[$type . 'address']['street'] . ' ' . $user[$type . 'address']['streetnumber'] |
|
@@ 1645-1649 (lines=5) @@ | ||
1642 | $address['street_name'] = $user[$type . 'address']['street']; |
|
1643 | $address['street_number'] = $user[$type . 'address']['streetnumber']; |
|
1644 | } |
|
1645 | } else { |
|
1646 | $address['street_address'] = trim( |
|
1647 | $user[$type . 'address']['street'] . ' ' . $user[$type . 'address']['streetnumber'] |
|
1648 | ); |
|
1649 | } |
|
1650 | ||
1651 | // Make sure phone number is unset if empty |
|
1652 | if ($address['phone'] === null){ |
@@ 624-627 (lines=4) @@ | ||
621 | if (isset($orderAddress['street_name']) && $orderAddress['street_number']) { |
|
622 | if (version_compare(Shopware::VERSION, '5.0.0', '>=')) { |
|
623 | $data[$type]['street'] = $orderAddress['street_name'] . ' ' . $orderAddress['street_number']; |
|
624 | } else { |
|
625 | $data[$type]['street'] = $orderAddress['street_name']; |
|
626 | $data[$type]['streetnumber'] = $orderAddress['street_number']; |
|
627 | } |
|
628 | } else { |
|
629 | $data[$type]['street'] = $orderAddress['street_address']; |
|
630 | $data[$type]['streetnumber'] = ' '; |