Cleans up pay later billing [#975]
Fixes several ecommerce reports [#975]