Ensure payment_state is *really* set to credit_owed when an order is cancelled

Fixes #3711