Updated cart to include discount
- Using cart.product.price for the price and not base_price
- Dynamically show discount column if a discount is present
Updated cart to use new fullPrice() method
Merge remote-tracking branch 'ryan/feature/discount-changes' into vp