Fix bug in calculateTotal

Was using the wrong variable for nonIntegratedFee
See [Trello 250](https://trello.com/c/d15w2vOn)