Fix for Calculate discounts (do not apply 0 amount discounts for line items)
Old order is canclled if paypal returns with error and is added to new cart
Some style fixes