Add @price_with_discount variable to cart_item, add to Checkout/Invoice controllers and views