Changing to order.payment? since order.payment was removed

Backporting patch from master.

(cherry picked from commit fe27245612ad8acd10113c6c0fe38f9448224c82)