fix discounts on one-time charges, #28956
fix discounts in general, #31273