Fix bug in calculateTotal

Was using the wrong variable for nonIntegratedFee
Merge pull request #673 from dleehr/fix-shoppingcart-noninteg

Fix bug in calculateTotal