Added local shipping address support for non-shipping payment methods