Updated the way that order totals get re-calculated
Merge branch 'feature-gm-updateOrderAmounts' into feature