Make cart total consider taxes

Fixes #6522