Improve and fix dealer badge properties

Improves dealer_max_badges to be more succinct. Fixes min_badges_addable
to also work for dealers without the "can_add" property checked.