eCommerce enhancements

These nested ifs could be a simple `and`.
not blocking, but nice to clean up