Fixed displaying of non-sale and discontinued products

When we would show products, discontinued and on_sale products would be shown in the list and filtered out of the display in the view, which wasn't going to work.  This commit modifies the the available scope to do the required filtering before it hits the view.

Signed-off-by: Nathan Lowrie <nate@finelineautomation.com>