Feature/cart quantity

merge together with shopping branch feature/cart-quantity