Finish how payment due is calculated
Merge remote-tracking branch 'origin/EVENT-58' into EVENT-58