Modify discount percent calculation and add new customer type