fix paymentech return processing when it's the default payment gateway, #21358, #21117