Only save the payment Id in the cart if we are using an existing payment