Add notifications on product returns + refactor commerce notifications + fixes.