Display the discount form when there are active vouchers -- even if no discount codes are defined.
Merge branch 'feature/voucher-discounts' into develop

Conflicts:
	cartridge/shop/views.py