ES-337 - update receipt layout and computation