fix cart order calculations

[merge]