Fix calculations for Taxes after discounts.

#2347 
You've removed the `$cart_tax` var from the calculation which, as far as I can tell, means it's removed from the cart total completely. Despite that, you've left the `$cart_tax` declaration in the function. If you intended to remove it completely, the var shouldn't be there anymore, but in that case... how are you including taxes in the final calculations?