Fix warning on Thank You page with COD, closes #4320
Merge pull request #4331 from kloon/fix_cod_thankyou_warning

Fix warning on Thank You page with COD, closes #4320