Order existence checking in payment callback
Merge branch 'dev'