adding validation...
Merge branch 'portal' into portalcart