Mixing goods with two-part tariffs