Converted discount CMSFields to introduce "for" option set for clearer configuration.
FIX: reduce discountable amount for all discount actions.
This prevents discounts going above maximum across
Make sure that Cart+Shipping discounts don't go over the
Merge branch 'issue/for-formfields'