Changing finalize_with_gift_card! to use ids rather than objects