move other discount related code into condition