Calculate order total for vouchers and donations properly.
Merge pull request #223 from onepercentclub/total-recall

Calculate order total for vouchers and donations properly.