Merge branch 'master' into documentation

This commit is contained in:
Christopher Neugebauer 2016-04-25 09:51:19 +10:00
commit 05c55bd7db

View file

@ -9,9 +9,9 @@ Things that are the same
* Products are split into categories * Products are split into categories
* Products can be listed under ceilings * Products can be listed under ceilings
* Products can be included for free by purchasing other items * Products can be included for free by purchasing other items
* e.g. a Professional Ticket includes a dinner ticket * e.g. a Professional Ticket includes a dinner ticket
* Products can be enabled by user roles * Products can be enabled by user roles
* e.g. Speakers Dinner tickets are visible to speakers * e.g. Speakers Dinner tickets are visible to speakers
* Vouchers can be used to discount products * Vouchers can be used to discount products
Things that are different Things that are different
@ -20,7 +20,7 @@ Things that are different
implemented by applying a ceiling-type discount, rather than duplicating the implemented by applying a ceiling-type discount, rather than duplicating the
ticket type. ticket type.
* Vouchers can be used to enable products * Vouchers can be used to enable products
* e.g. Sponsor tickets do not appear until you supply a sponsor's voucher * e.g. Sponsor tickets do not appear until you supply a sponsor's voucher
* Items may be enabled by having other specific items present * Items may be enabled by having other specific items present
* e.g. Extra accommodation nights do not appear until you purchase the main * e.g. Extra accommodation nights do not appear until you purchase the main
week worth of accommodation. week worth of accommodation.