Merge pull request #2341 from neilLasrado/shopping-cart-fix

shopping cart fix