Add the product filter form to the inventory page
Fixed promotion scenarios
Fixed tests
Merge pull request #754 from umpirsky/feature/promotions-reloaded

Promotions