Including customer ID; Fixed payment state bug with normal invoice