[Bug]: Address gets nulled in multi step checkout

[MassiveHiggsField]

What happened?

If i activate the multi step checkout, the order gets correctly saved (as partial) on the first step and the address_id will be set correctly. But on the second step when the order gets saved again, the address_id field is set to null.

What did you expect to happen?

The address_id should not get set to null

Version

3.x

What browser are you seeing the problem on?

No response

Relevant log output

No response

[MassiveHiggsField]

The problem is with this code:

ti-ext-cart/classes/OrderManager.php

Line 181 in 7311ace

$addressId = null;

On step #2 there won't be any address data in post, so $addressId will stay null and then in line 196 it will be saved to the order object. A quickfix could be to change line 196 to this:

    if (!($order->address_id > 0)) {
        $order->address_id = $addressId;
    }

But i don't know if that has any other implications.